Title: [96617] trunk/Source/WebCore
- Revision
- 96617
- Author
- [email protected]
- Date
- 2011-10-04 11:15:09 -0700 (Tue, 04 Oct 2011)
Log Message
More work towards making PlatformWheelEvent immutable
https://bugs.webkit.org/show_bug.cgi?id=69348
Reviewed by Sam Weinig.
More work on getting rid of m_isAccepted from PlatformWheelEvent. Add more asserts
that the return value of handleWheelEvent is equal to m_isAccepted.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent):
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::handleWheelEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96616 => 96617)
--- trunk/Source/WebCore/ChangeLog 2011-10-04 18:14:19 UTC (rev 96616)
+++ trunk/Source/WebCore/ChangeLog 2011-10-04 18:15:09 UTC (rev 96617)
@@ -1,3 +1,18 @@
+2011-10-04 Anders Carlsson <[email protected]>
+
+ More work towards making PlatformWheelEvent immutable
+ https://bugs.webkit.org/show_bug.cgi?id=69348
+
+ Reviewed by Sam Weinig.
+
+ More work on getting rid of m_isAccepted from PlatformWheelEvent. Add more asserts
+ that the return value of handleWheelEvent is equal to m_isAccepted.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleWheelEvent):
+ * platform/ScrollAnimator.cpp:
+ (WebCore::ScrollAnimator::handleWheelEvent):
+
2011-10-04 Cary Clark <[email protected]>
Inset focus ring (Skia on Mac)
Modified: trunk/Source/WebCore/page/EventHandler.cpp (96616 => 96617)
--- trunk/Source/WebCore/page/EventHandler.cpp 2011-10-04 18:14:19 UTC (rev 96616)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2011-10-04 18:15:09 UTC (rev 96617)
@@ -2189,16 +2189,19 @@
}
}
- if (e.isAccepted())
- return true;
+ // isAccepted can't be true here, because then we would already have returned from this function.
+ ASSERT(!e.isAccepted());
+
// We do another check on the frame view because the event handler can run JS which results in the frame getting destroyed.
view = m_frame->view();
if (!view)
return false;
- view->wheelEvent(e);
- return e.isAccepted();
+ bool handled = view->wheelEvent(e);
+ ASSERT(handled == e.isAccepted());
+
+ return handled;
}
void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEvent)
Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (96616 => 96617)
--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2011-10-04 18:14:19 UTC (rev 96616)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2011-10-04 18:15:09 UTC (rev 96617)
@@ -91,6 +91,8 @@
float deltaX = horizontalScrollbar ? e.deltaX() : 0;
float deltaY = verticalScrollbar ? e.deltaY() : 0;
+ bool handled = false;
+
IntSize maxForwardScrollDelta = m_scrollableArea->maximumScrollPosition() - m_scrollableArea->scrollPosition();
IntSize maxBackwardScrollDelta = m_scrollableArea->scrollPosition() - m_scrollableArea->minimumScrollPosition();
if ((deltaX < 0 && maxForwardScrollDelta.width() > 0)
@@ -98,6 +100,7 @@
|| (deltaY < 0 && maxForwardScrollDelta.height() > 0)
|| (deltaY > 0 && maxBackwardScrollDelta.height() > 0)) {
e.accept();
+ handled = true;
if (e.granularity() == ScrollByPageWheelEvent) {
ASSERT(!e.deltaX());
bool negative = deltaY < 0;
@@ -112,7 +115,8 @@
scroll(HorizontalScrollbar, ScrollByPixel, horizontalScrollbar->pixelStep(), -deltaX);
}
- return e.isAccepted();
+ ASSERT(e.isAccepted() == handled);
+ return handled;
}
#if ENABLE(GESTURE_EVENTS)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
