_setDidMoveSwipeSnapshotCallback's block should only be called if the snapshot is...

https://bugs.webkit.org/show_bug.cgi?id=136354
<rdar://problem/18167791>

Reviewed by Simon Fraser.

* UIProcess/API/Cocoa/WKViewPrivate.h:
Update the comment to note the new behavior.

* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
Don't call the block until the snapshot is actually moving (if the snapshot
never moves because it's behind the live view, don't call the block at all).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index eab77c85bcd92707945d48d2883ba7af673ee912..b3124192958ea4c3a879dc4756d497059052b4cf 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2014-08-28  Tim Horton  <timothy_horton@apple.com>
+
+        _setDidMoveSwipeSnapshotCallback's block should only be called if the snapshot is going to move
+        https://bugs.webkit.org/show_bug.cgi?id=136354
+        <rdar://problem/18167791>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/API/Cocoa/WKViewPrivate.h:
+        Update the comment to note the new behavior.
+
+        * UIProcess/mac/ViewGestureControllerMac.mm:
+        (WebKit::ViewGestureController::beginSwipeGesture):
+        Don't call the block until the snapshot is actually moving (if the snapshot
+        never moves because it's behind the live view, don't call the block at all).
+
 2014-08-28  Tim Horton  <timothy_horton@apple.com>
 
         Occasional thread-safety-related crashes on the ServicesController queue

diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h b/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
index 3b52a1f51f10eb14bd8f70129b7fb20830a66489..ea2d95b1508e549e85915b43b7f5fca4112e209e 100644 (file)
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
@@ -113,7 +113,7 @@
 // The top content inset is applied in the window's coordinate space, to the union of the custom swipe view's frames.
 - (void)_setCustomSwipeViewsTopContentInset:(float)topContentInset;
 - (BOOL)_tryToSwipeWithEvent:(NSEvent *)event ignoringPinnedState:(BOOL)ignoringPinnedState;
-// The rect returned is always that of the snapshot, not necessarily the swiping layer. This only works for layer-backed windows.
+// The rect returned is always that of the snapshot, and only if it is the view being manipulated by the swipe. This only works for layer-backed windows.
 - (void)_setDidMoveSwipeSnapshotCallback:(void(^)(CGRect swipeSnapshotRectInWindowCoordinates))callback;
 
 #endif

diff --git a/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm b/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm
index 9b71b9bcdf4844025aaf8a09d75c26a2f6215f44..5d64d96c04a28109a57ce86e3325c31ffa549c0c 100644 (file)
--- a/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm
+++ b/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm
@@ -608,8 +608,6 @@ void ViewGestureController::beginSwipeGesture(WebBackForwardListItem* targetItem
         [snapshotLayerParent insertSublayer:m_swipeLayer.get() below:layerAdjacentToSnapshot];
     else
         [snapshotLayerParent insertSublayer:m_swipeLayer.get() above:layerAdjacentToSnapshot];
-
-    didMoveSwipeSnapshotLayer();
 }
 
 void ViewGestureController::handleSwipeGesture(WebBackForwardListItem* targetItem, double progress, SwipeDirection direction)