Skip to site navigation (Press enter)

[webkit-changes] [169141] branches/safari-538.34-branch/Source/WebCore

matthew_hanson Tue, 20 May 2014 17:08:31 -0700

Title: [169141] branches/safari-538.34-branch/Source/WebCore

Revision: 169141
Author: [email protected]
Date: 2014-05-20 17:07:56 -0700 (Tue, 20 May 2014)

Log Message

Rollout r169076.


Modified Paths

branches/safari-538.34-branch/Source/WebCore/ChangeLog
branches/safari-538.34-branch/Source/WebCore/page/mac/EventHandlerMac.mm

Diff

Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (169140 => 169141)


--- branches/safari-538.34-branch/Source/WebCore/ChangeLog	2014-05-21 00:03:56 UTC (rev 169140)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog	2014-05-21 00:07:56 UTC (rev 169141)
@@ -1,5 +1,9 @@
 2014-05-20  Matthew Hanson  <[email protected]>
 
+        Rollout r169076.
+
+2014-05-20  Matthew Hanson  <[email protected]>
+
         Merge r168974.
 
     2014-05-16  Jer Noble  <[email protected]>

Modified: branches/safari-538.34-branch/Source/WebCore/page/mac/EventHandlerMac.mm (169140 => 169141)


--- branches/safari-538.34-branch/Source/WebCore/page/mac/EventHandlerMac.mm	2014-05-21 00:03:56 UTC (rev 169140)
+++ branches/safari-538.34-branch/Source/WebCore/page/mac/EventHandlerMac.mm	2014-05-21 00:07:56 UTC (rev 169141)
@@ -804,7 +804,7 @@
     }
     
     if (wheelEvent.shouldConsiderLatching()) {
-        if (scrollableArea && scrollableContainer)
+        if (scrollableArea)
             m_startedGestureAtScrollLimit = scrolledToEdgeInDominantDirection(*scrollableContainer, *scrollableArea, wheelEvent.deltaX(), wheelEvent.deltaY());
         else
             m_startedGestureAtScrollLimit = false;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes