Log Message
[chromium] Allow WebGestureEvent to store four floating point values https://bugs.webkit.org/show_bug.cgi?id=84053
Patch by Terry Anderson <tdander...@chromium.org> on 2012-04-16 Reviewed by Darin Fisher. See bug description for an explanation of the changes made. Source/WebCore: * platform/PlatformGestureEvent.h: (WebCore::PlatformGestureEvent::PlatformGestureEvent): (PlatformGestureEvent): (WebCore::PlatformGestureEvent::gammaX): (WebCore::PlatformGestureEvent::gammaY): Source/WebKit/chromium: * public/WebInputEvent.h: (WebGestureEvent): (WebKit::WebGestureEvent::WebGestureEvent): * src/WebInputEvent.cpp: (SameSizeAsWebGestureEvent): * src/WebInputEventConversion.cpp: (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114300 => 114301)
--- trunk/Source/WebCore/ChangeLog 2012-04-16 21:44:38 UTC (rev 114300)
+++ trunk/Source/WebCore/ChangeLog 2012-04-16 21:50:48 UTC (rev 114301)
@@ -1,3 +1,18 @@
+2012-04-16 Terry Anderson <tdander...@chromium.org>
+
+ [chromium] Allow WebGestureEvent to store four floating point values
+ https://bugs.webkit.org/show_bug.cgi?id=84053
+
+ Reviewed by Darin Fisher.
+
+ See bug description for an explanation of the changes made.
+
+ * platform/PlatformGestureEvent.h:
+ (WebCore::PlatformGestureEvent::PlatformGestureEvent):
+ (PlatformGestureEvent):
+ (WebCore::PlatformGestureEvent::gammaX):
+ (WebCore::PlatformGestureEvent::gammaY):
+
2012-04-16 Kentaro Hara <hara...@chromium.org>
[Refactoring][V8] Remove $indent from NativeToJSValue()
Modified: trunk/Source/WebCore/platform/PlatformGestureEvent.h (114300 => 114301)
--- trunk/Source/WebCore/platform/PlatformGestureEvent.h 2012-04-16 21:44:38 UTC (rev 114300)
+++ trunk/Source/WebCore/platform/PlatformGestureEvent.h 2012-04-16 21:50:48 UTC (rev 114301)
@@ -41,25 +41,31 @@
: PlatformEvent(PlatformEvent::GestureScrollBegin)
, m_deltaX(0)
, m_deltaY(0)
+ , m_gammaX(0)
+ , m_gammaY(0)
{
}
- PlatformGestureEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, double timestamp, float deltaX, float deltaY, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey)
+ PlatformGestureEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, double timestamp, float deltaX, float deltaY, float gammaX, float gammaY, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey)
: PlatformEvent(type, shiftKey, ctrlKey, altKey, metaKey, timestamp)
, m_position(position)
, m_globalPosition(globalPosition)
, m_deltaX(deltaX)
, m_deltaY(deltaY)
+ , m_gammaX(gammaX)
+ , m_gammaY(gammaY)
{
}
- PlatformGestureEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, double timestamp, const IntSize& area, const FloatPoint& delta, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey)
+ PlatformGestureEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, double timestamp, const IntSize& area, const FloatPoint& delta, const FloatPoint& gamma, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey)
: PlatformEvent(type, shiftKey, ctrlKey, altKey, metaKey, timestamp)
, m_position(position)
, m_globalPosition(globalPosition)
, m_area(area)
, m_deltaX(delta.x())
, m_deltaY(delta.y())
+ , m_gammaX(gamma.x())
+ , m_gammaY(gamma.y())
{
}
@@ -70,6 +76,9 @@
float deltaX() const { return m_deltaX; }
float deltaY() const { return m_deltaY; }
+
+ float gammaX() const { return m_gammaX; }
+ float gammaY() const { return m_gammaY; }
protected:
IntPoint m_position;
@@ -77,6 +86,8 @@
IntSize m_area;
float m_deltaX;
float m_deltaY;
+ float m_gammaX;
+ float m_gammaY;
};
} // namespace WebCore
Modified: trunk/Source/WebKit/chromium/ChangeLog (114300 => 114301)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-16 21:44:38 UTC (rev 114300)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-16 21:50:48 UTC (rev 114301)
@@ -1,3 +1,20 @@
+2012-04-16 Terry Anderson <tdander...@chromium.org>
+
+ [chromium] Allow WebGestureEvent to store four floating point values
+ https://bugs.webkit.org/show_bug.cgi?id=84053
+
+ Reviewed by Darin Fisher.
+
+ See bug description for an explanation of the changes made.
+
+ * public/WebInputEvent.h:
+ (WebGestureEvent):
+ (WebKit::WebGestureEvent::WebGestureEvent):
+ * src/WebInputEvent.cpp:
+ (SameSizeAsWebGestureEvent):
+ * src/WebInputEventConversion.cpp:
+ (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
+
2012-04-16 Alexey Proskuryakov <a...@apple.com>
[chromium] Remove BlobRegistryProxy::createResourceHandle
Modified: trunk/Source/WebKit/chromium/public/WebInputEvent.h (114300 => 114301)
--- trunk/Source/WebKit/chromium/public/WebInputEvent.h 2012-04-16 21:44:38 UTC (rev 114300)
+++ trunk/Source/WebKit/chromium/public/WebInputEvent.h 2012-04-16 21:50:48 UTC (rev 114301)
@@ -359,9 +359,11 @@
int globalX;
int globalY;
- // NOTE: |deltaX| and |deltaY| represents the amount to scroll for Scroll gesture events. For Pinch gesture events, |deltaX| represents the scaling/magnification factor.
+ // NOTE: |deltaX| and |deltaY| represents the amount to scroll for Scroll gesture events. For Pinch gesture events, |deltaX| represents the scaling/magnification factor. For Tap and Press events, |deltaX|,|deltaY| and |gammaX|,|gammaY| correspond to the top left and bottom right corners of the ellipse's enlosing rectangle for tap target fuzzing.
float deltaX;
float deltaY;
+ float gammaX;
+ float gammaY;
WebGestureEvent(unsigned sizeParam = sizeof(WebGestureEvent))
: WebInputEvent(sizeParam)
@@ -371,6 +373,8 @@
, globalY(0)
, deltaX(0.0f)
, deltaY(0.0f)
+ , gammaX(0.0f)
+ , gammaY(0.0f)
{
}
};
Modified: trunk/Source/WebKit/chromium/src/WebInputEvent.cpp (114300 => 114301)
--- trunk/Source/WebKit/chromium/src/WebInputEvent.cpp 2012-04-16 21:44:38 UTC (rev 114300)
+++ trunk/Source/WebKit/chromium/src/WebInputEvent.cpp 2012-04-16 21:50:48 UTC (rev 114301)
@@ -60,7 +60,7 @@
};
class SameSizeAsWebGestureEvent : public SameSizeAsWebInputEvent {
- int gestureData[6];
+ int gestureData[8];
};
class SameSizeAsWebTouchEvent : public SameSizeAsWebInputEvent {
Modified: trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp (114300 => 114301)
--- trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp 2012-04-16 21:44:38 UTC (rev 114300)
+++ trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp 2012-04-16 21:50:48 UTC (rev 114301)
@@ -174,6 +174,8 @@
m_globalPosition = IntPoint(e.globalX, e.globalY);
m_deltaX = e.deltaX;
m_deltaY = e.deltaY;
+ m_gammaX = e.gammaX;
+ m_gammaY = e.gammaY;
m_timestamp = e.timeStampSeconds;
m_modifiers = 0;
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
