Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172785 => 172786)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 23:43:40 UTC (rev 172785)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 23:45:13 UTC (rev 172786)
@@ -1,5 +1,23 @@
2014-08-19 Dana Burkart <[email protected]>
+ Merge r172705. <rdar://problem/17767169>
+
+ 2014-08-18 Brent Fulgham <[email protected]>
+
+ [Mac] Follow-up to r136040 based on Darin Adler's comments.
+
+ Pass Widget* as a Widget&, since it can never be null.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::platformCompletePlatformWidgetWheelEvent):
+ (WebCore::EventHandler::handleWheelEvent):
+ * page/EventHandler.h:
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformCompleteWheelEvent):
+ (WebCore::EventHandler::platformCompletePlatformWidgetWheelEvent):
+
+2014-08-19 Dana Burkart <[email protected]>
+
Merge r172703. <rdar://problem/17767169>
2014-08-17 Brent Fulgham <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebCore/page/EventHandler.cpp (172785 => 172786)
--- branches/safari-600.1-branch/Source/WebCore/page/EventHandler.cpp 2014-08-19 23:43:40 UTC (rev 172785)
+++ branches/safari-600.1-branch/Source/WebCore/page/EventHandler.cpp 2014-08-19 23:45:13 UTC (rev 172786)
@@ -2534,7 +2534,7 @@
return didHandleEvent;
}
-bool EventHandler::platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget*, ContainerNode*)
+bool EventHandler::platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget&, ContainerNode*)
{
return true;
}
@@ -2593,7 +2593,7 @@
scrollableArea->setScrolledProgrammatically(false);
if (!widget->platformWidget())
return true;
- return platformCompletePlatformWidgetWheelEvent(event, widget, scrollableContainer.get());
+ return platformCompletePlatformWidgetWheelEvent(event, *widget, scrollableContainer.get());
}
}
}
Modified: branches/safari-600.1-branch/Source/WebCore/page/EventHandler.h (172785 => 172786)
--- branches/safari-600.1-branch/Source/WebCore/page/EventHandler.h 2014-08-19 23:43:40 UTC (rev 172785)
+++ branches/safari-600.1-branch/Source/WebCore/page/EventHandler.h 2014-08-19 23:45:13 UTC (rev 172786)
@@ -200,7 +200,7 @@
void platformPrepareForWheelEvents(const PlatformWheelEvent&, const HitTestResult&, RefPtr<Element>& eventTarget, RefPtr<ContainerNode>& scrollableContainer, ScrollableArea*&, bool& isOverWidget);
void platformRecordWheelEvent(const PlatformWheelEvent&);
bool platformCompleteWheelEvent(const PlatformWheelEvent&, Element* eventTarget, ContainerNode* scrollableContainer, ScrollableArea*);
- bool platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget*, ContainerNode* scrollableContainer);
+ bool platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget&, ContainerNode* scrollableContainer);
#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
typedef Vector<RefPtr<Touch>> TouchArray;
Modified: branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm (172785 => 172786)
--- branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm 2014-08-19 23:43:40 UTC (rev 172785)
+++ branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm 2014-08-19 23:45:13 UTC (rev 172786)
@@ -893,10 +893,11 @@
didHandleWheelEvent = !m_startedGestureAtScrollLimit;
}
- // If the platform widget is handling the event, we always want to return false.
+ // If the platform widget is handling the event, we always want to return false for WebKit2, but
+ // true for WebKit1.
if (view && scrollableArea == view && view->platformWidget())
- didHandleWheelEvent = false;
-
+ didHandleWheelEvent = frameHasPlatformWidget(m_frame);
+
m_isHandlingWheelEvent = false;
return didHandleWheelEvent;
}
@@ -916,10 +917,10 @@
return didHandleEvent;
}
-bool EventHandler::platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent& wheelEvent, const Widget* widget, ContainerNode* scrollableContainer)
+bool EventHandler::platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent& wheelEvent, const Widget& widget, ContainerNode* scrollableContainer)
{
// WebKit1: Prevent multiple copies of the scrollWheel event from being sent to the NSScrollView widget.
- if (frameHasPlatformWidget(m_frame) && widget->isFrameView())
+ if (frameHasPlatformWidget(m_frame) && widget.isFrameView())
return true;
if (wheelEvent.useLatchedEventElement() && m_latchedScrollableContainer && scrollableContainer == m_latchedScrollableContainer)
