Changeset 173094 in webkit

Timestamp:

Aug 28, 2014, 5:09:46 PM (11 years ago)

Author:

Lucas Forschler

Message:

Merged r173040. rdar://problem/18105827

Location:

branches/safari-600.1-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/mac/PageClientImpl.h (modified) (1 diff)
• UIProcess/mac/PageClientImpl.mm (modified) (1 diff)
• UIProcess/mac/ViewGestureController.h (modified) (3 diffs)
• UIProcess/mac/ViewGestureControllerMac.mm (modified) (6 diffs)
• UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)

branches/safari-600.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-08-28  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r173040
+
+    2014-08-27  Tim Horton  <timothy_horton@apple.com>
+
+            WebKit2 swipe gesture should report the position of the snapshot to the client
+            https://bugs.webkit.org/show_bug.cgi?id=136308
+            rdar://problem/18105827
+
+            Reviewed by Simon Fraser.
+
+            * UIProcess/API/Cocoa/WKViewPrivate.h:
+            * UIProcess/API/mac/WKView.mm:
+            (-[WKView _setDidMoveSwipeSnapshotCallback:]):
+            Add _setDidMoveSwipeSnapshotCallback, and plumb it to ViewGestureController.
+            Callers provide a block which is called whenever ViewGestureController moves the
+            swipe *snapshot* layer around.
+
+            * UIProcess/PageClient.h:
+            * UIProcess/WebPageProxy.h:
+            * UIProcess/mac/PageClientImpl.h:
+            * UIProcess/mac/PageClientImpl.mm:
+            (WebKit::PageClientImpl::boundsOfLayerInLayerBackedWindowCoordinates):
+            * UIProcess/mac/WebPageProxyMac.mm:
+            (WebKit::WebPageProxy::boundsOfLayerInLayerBackedWindowCoordinates):
+            Expose a Mac-only way to get the bounds of a given CALayer in window coordinates,
+            respecting transforms. This only works for layer-backed windows because
+            it uses CA in order to do the mapping respecting transforms.
+
+            * UIProcess/mac/ViewGestureController.h:
+            * UIProcess/mac/ViewGestureControllerMac.mm:
+            (WebKit::ViewGestureController::ViewGestureController):
+            (WebKit::ViewGestureController::~ViewGestureController):
+            (WebKit::ViewGestureController::setDidMoveSwipeSnapshotCallback):
+            Do the Block_copy and Block_release dance to keep our copy of the callback block.
+
+            (WebKit::ViewGestureController::beginSwipeGesture):
+            (WebKit::ViewGestureController::handleSwipeGesture):
+            (WebKit::ViewGestureController::didMoveSwipeSnapshotLayer):
+            When the swipe snapshot layer moves around, call the block.
+
 2014-08-28  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

@@ -114 +114 @@
 - (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.
+- (void)_setDidMoveSwipeSnapshotCallback:(void(^)(CGRect swipeSnapshotRectInWindowCoordinates))callback;
 
 #endif

branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -4081 +4081 @@
 }
 
+- (void)_setDidMoveSwipeSnapshotCallback:(void(^)(CGRect))callback
+{
+    if (!_data->_allowsBackForwardNavigationGestures)
+        return;
+
+    [self _ensureGestureController];
+    _data->_gestureController->setDidMoveSwipeSnapshotCallback(callback);
+}
+
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 

branches/safari-600.1-branch/Source/WebKit2/UIProcess/PageClient.h

@@ -232 +232 @@
     virtual void removeNavigationGestureSnapshot() = 0;
 
+    virtual CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *) const = 0;
+
     virtual ColorSpaceData colorSpace() = 0;
 

branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -510 +510 @@
     WKView* wkView() const;
     void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize);
+    CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *) const;
 #endif
 #endif // PLATFORM(COCOA)

branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h

@@ -109 +109 @@
     virtual WebCore::IntRect rootViewToAccessibilityScreen(const WebCore::IntRect&) = 0;
 #endif
-        
+
+    CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const;
+
     virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled);
 

branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

@@ -743 +743 @@
 }
 
+CGRect PageClientImpl::boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const
+{
+    CALayer *windowContentLayer = static_cast<NSView *>(m_wkView.window.contentView).layer;
+    ASSERT(windowContentLayer);
+
+    return [windowContentLayer convertRect:layer.bounds fromLayer:layer];
+}
+
 } // namespace WebKit
 

branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/ViewGestureController.h

@@ -101 +101 @@
     void setCustomSwipeViewsTopContentInset(float topContentInset) { m_customSwipeViewsTopContentInset = topContentInset; }
     WebCore::FloatRect windowRelativeBoundsForCustomSwipeViews() const;
+    void setDidMoveSwipeSnapshotCallback(void(^)(CGRect));
 
     void endActiveGesture();
@@ -149 +150 @@
     CALayer *determineLayerAdjacentToSnapshotForParent(SwipeDirection, CALayer *snapshotLayerParent) const;
     void applyDebuggingPropertiesToSwipeViews();
+    void didMoveSwipeSnapshotLayer();
 #endif
 
@@ -189 +191 @@
     SwipeDirection m_pendingSwipeDirection;
     WebCore::FloatSize m_cumulativeDeltaForPendingSwipe;
+
+    void (^m_didMoveSwipeSnapshotCallback)(CGRect);
 
     bool m_shouldIgnorePinnedState;

branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm

@@ -107 +107 @@
     , m_customSwipeViewsTopContentInset(0)
     , m_pendingSwipeReason(PendingSwipeReason::None)
+    , m_didMoveSwipeSnapshotCallback(nullptr)
     , m_shouldIgnorePinnedState(false)
     , m_swipeWaitingForVisuallyNonEmptyLayout(false)
@@ -124 +125 @@
         removeSwipeSnapshot();
 
+    if (m_didMoveSwipeSnapshotCallback) {
+        Block_release(m_didMoveSwipeSnapshotCallback);
+        m_didMoveSwipeSnapshotCallback = nullptr;
+    }
+
     m_webPageProxy.process().removeMessageReceiver(Messages::ViewGestureController::messageReceiverName(), m_webPageProxy.pageID());
 }
@@ -314 +320 @@
 
     return true;
+}
+
+void ViewGestureController::setDidMoveSwipeSnapshotCallback(void(^callback)(CGRect))
+{
+    if (m_didMoveSwipeSnapshotCallback)
+        Block_release(m_didMoveSwipeSnapshotCallback);
+    m_didMoveSwipeSnapshotCallback = Block_copy(callback);
 }
 
@@ -596 +609 @@
     else
         [snapshotLayerParent insertSublayer:m_swipeLayer.get() above:layerAdjacentToSnapshot];
+
+    didMoveSwipeSnapshotLayer();
 }
 
@@ -614 +629 @@
 
     if (m_swipeTransitionStyle == SwipeTransitionStyle::Overlap) {
-        if (direction == SwipeDirection::Right)
+        if (direction == SwipeDirection::Right) {
             [m_swipeLayer setTransform:CATransform3DMakeTranslation(width + swipingLayerOffset, 0, 0)];
+            didMoveSwipeSnapshotLayer();
+        }
     } else if (m_swipeTransitionStyle == SwipeTransitionStyle::Push)
         [m_swipeLayer setTransform:CATransform3DMakeTranslation((direction == SwipeDirection::Left ? -width : width) + swipingLayerOffset, 0, 0)];
@@ -628 +645 @@
 }
 
+void ViewGestureController::didMoveSwipeSnapshotLayer()
+{
+    if (!m_didMoveSwipeSnapshotCallback)
+        return;
+
+    m_didMoveSwipeSnapshotCallback(m_webPageProxy.boundsOfLayerInLayerBackedWindowCoordinates(m_swipeLayer.get()));
+}
+
 void ViewGestureController::endSwipeGesture(WebBackForwardListItem* targetItem, bool cancelled)
 {

branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

@@ -664 +664 @@
 #endif
 
+CGRect WebPageProxy::boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const
+{
+    return m_pageClient.boundsOfLayerInLayerBackedWindowCoordinates(layer);
+}
+
 } // namespace WebKit