Commit cffbc445 authored by eric@webkit.org's avatar eric@webkit.org

2010-03-03 Garret Kelly <gdk@chromium.org>

        Reviewed by Darin Fisher.

        Adding touch event type and point type. Tested against the try bots.
        https://bugs.webkit.org/show_bug.cgi?id=35691

        * public/WebInputEvent.h:
        (WebKit::WebInputEvent::):
        (WebKit::WebInputEvent::isTouchEventType):
        (WebKit::WebTouchEvent::WebTouchEvent):
        * public/WebTouchPoint.h: Added.
        (WebKit::WebTouchPoint::WebTouchPoint):
        (WebKit::WebTouchPoint::):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55507 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4064aa2b
2010-03-03 Garret Kelly <gdk@chromium.org>
Reviewed by Darin Fisher.
Adding touch event type and point type. Tested against the try bots.
https://bugs.webkit.org/show_bug.cgi?id=35691
* public/WebInputEvent.h:
(WebKit::WebInputEvent::):
(WebKit::WebInputEvent::isTouchEventType):
(WebKit::WebTouchEvent::WebTouchEvent):
* public/WebTouchPoint.h: Added.
(WebKit::WebTouchPoint::WebTouchPoint):
(WebKit::WebTouchPoint::):
2010-03-02 Tony Chang <tony@chromium.org>
Reviewed by Darin Fisher.
......
......@@ -32,6 +32,7 @@
#define WebInputEvent_h
#include "WebCommon.h"
#include "WebTouchPoint.h"
#include <string.h>
......@@ -96,7 +97,13 @@ public:
RawKeyDown,
KeyDown,
KeyUp,
Char
Char,
// WebTouchEvent
TouchStart,
TouchMove,
TouchEnd,
TouchCancel,
};
enum Modifiers {
......@@ -129,6 +136,15 @@ public:
|| type == KeyUp
|| type == Char;
}
// Returns true if the WebInputEvent |type| is a touch event.
static bool isTouchEventType(int type)
{
return type == TouchStart
|| type == TouchMove
|| type == TouchEnd
|| type == TouchCancel;
}
};
// WebKeyboardEvent -----------------------------------------------------------
......@@ -255,6 +271,22 @@ public:
}
};
// WebTouchEvent --------------------------------------------------------------
class WebTouchEvent : public WebInputEvent {
public:
static const int touchPointsLengthCap = 4;
int touchPointsLength;
WebTouchPoint touchPoints[touchPointsLengthCap];
WebTouchEvent(unsigned sizeParam = sizeof(WebTouchEvent))
: WebInputEvent(sizeParam)
, touchPointsLength(0)
{
}
};
} // namespace WebKit
#endif
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef WebTouchPoint_h
#define WebTouchPoint_h
#include "WebCommon.h"
#include "WebPoint.h"
namespace WebKit {
class WebTouchPoint {
public:
WebTouchPoint()
: id(0)
, state(StateUndefined) { }
enum State {
StateUndefined,
StateReleased,
StatePressed,
StateMoved,
StateStationary,
StateCancelled,
};
int id;
State state;
WebPoint screenPosition;
WebPoint position;
};
} // namespace WebKit
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment