Title: [172788] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172788
- Author
- dburk...@apple.com
- Date
- 2014-08-19 16:50:49 -0700 (Tue, 19 Aug 2014)
Log Message
Merge r172720. <rdar://problem/17767169>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172787 => 172788)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 23:49:01 UTC (rev 172787)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 23:50:49 UTC (rev 172788)
@@ -1,5 +1,17 @@
2014-08-19 Dana Burkart <dburk...@apple.com>
+ Merge r172720. <rdar://problem/17767169>
+
+ 2014-08-18 Brent Fulgham <bfulg...@apple.com>
+
+ [Mac] Unreviewed merge correction.
+
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformCompleteWheelEvent): Revert an
+ unintended change from r172705.
+
+2014-08-19 Dana Burkart <dburk...@apple.com>
+
Merge r172709. <rdar://problem/17850158>
2014-08-18 Andy Estes <aes...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm (172787 => 172788)
--- branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm 2014-08-19 23:49:01 UTC (rev 172787)
+++ branches/safari-600.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm 2014-08-19 23:50:49 UTC (rev 172788)
@@ -893,10 +893,9 @@
didHandleWheelEvent = !m_startedGestureAtScrollLimit;
}
- // If the platform widget is handling the event, we always want to return false for WebKit2, but
- // true for WebKit1.
+ // If the platform widget is handling the event, we always want to return false
if (view && scrollableArea == view && view->platformWidget())
- didHandleWheelEvent = frameHasPlatformWidget(m_frame);
+ didHandleWheelEvent = false;
m_isHandlingWheelEvent = false;
return didHandleWheelEvent;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
