Title: [103189] trunk/Source/WebCore
- Revision
- 103189
- Author
- [email protected]
- Date
- 2011-12-18 13:54:28 -0800 (Sun, 18 Dec 2011)
Log Message
Spruce up PlatformWheelEvent a bit
https://bugs.webkit.org/show_bug.cgi?id=74821
Reviewed by Dan Bernstein.
* dom/WheelEvent.cpp:
(WebCore::WheelEventDispatchMediator::WheelEventDispatchMediator):
* platform/PlatformWheelEvent.h:
(WebCore::PlatformWheelEvent::directionInvertedFromDevice):
Remove x/y getters in favor of direct access to the IntPoints, and rename
webkitDirectionInvertedFromDevice() to directionInvertedFromDevice() since
it is not an exposed API.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (103188 => 103189)
--- trunk/Source/WebCore/ChangeLog 2011-12-18 21:49:45 UTC (rev 103188)
+++ trunk/Source/WebCore/ChangeLog 2011-12-18 21:54:28 UTC (rev 103189)
@@ -1,3 +1,18 @@
+2011-12-18 Sam Weinig <[email protected]>
+
+ Spruce up PlatformWheelEvent a bit
+ https://bugs.webkit.org/show_bug.cgi?id=74821
+
+ Reviewed by Dan Bernstein.
+
+ * dom/WheelEvent.cpp:
+ (WebCore::WheelEventDispatchMediator::WheelEventDispatchMediator):
+ * platform/PlatformWheelEvent.h:
+ (WebCore::PlatformWheelEvent::directionInvertedFromDevice):
+ Remove x/y getters in favor of direct access to the IntPoints, and rename
+ webkitDirectionInvertedFromDevice() to directionInvertedFromDevice() since
+ it is not an exposed API.
+
2011-12-18 Anders Carlsson <[email protected]>
Scroll the main frame on the scrolling thread
Modified: trunk/Source/WebCore/dom/WheelEvent.cpp (103188 => 103189)
--- trunk/Source/WebCore/dom/WheelEvent.cpp 2011-12-18 21:49:45 UTC (rev 103188)
+++ trunk/Source/WebCore/dom/WheelEvent.cpp 2011-12-18 21:54:28 UTC (rev 103189)
@@ -108,8 +108,8 @@
return;
setEvent(WheelEvent::create(FloatPoint(event.wheelTicksX(), event.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()),
- granularity(event), view, IntPoint(event.globalX(), event.globalY()), IntPoint(event.x(), event.y()),
- event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), event.webkitDirectionInvertedFromDevice()));
+ granularity(event), view, event.globalPos(), event.pos(),
+ event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), event.directionInvertedFromDevice()));
}
WheelEvent* WheelEventDispatchMediator::event() const
Modified: trunk/Source/WebCore/platform/PlatformWheelEvent.h (103188 => 103189)
--- trunk/Source/WebCore/platform/PlatformWheelEvent.h 2011-12-18 21:49:45 UTC (rev 103188)
+++ trunk/Source/WebCore/platform/PlatformWheelEvent.h 2011-12-18 21:54:28 UTC (rev 103189)
@@ -132,13 +132,8 @@
PlatformWheelEventGranularity granularity() const { return m_granularity; }
- int x() const { return m_position.x(); } // PlatformWindow coordinates.
- int y() const { return m_position.y(); }
- int globalX() const { return m_globalPosition.x(); } // Screen coordinates.
- int globalY() const { return m_globalPosition.y(); }
+ bool directionInvertedFromDevice() const { return m_directionInvertedFromDevice; }
- bool webkitDirectionInvertedFromDevice() const { return m_directionInvertedFromDevice; }
-
void turnVerticalTicksIntoHorizontal()
{
m_deltaX = m_deltaY;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
