Changeset 186532 in webkit

Timestamp:

Jul 8, 2015, 4:03:38 PM (10 years ago)

Author:

timothy_horton@apple.com

Message:

Snapshots can be misplaced when custom swipe views are offset from the window origin
​https://bugs.webkit.org/show_bug.cgi?id=146744
<rdar://problem/20942120>

Reviewed by Dean Jackson.

• UIProcess/mac/ViewGestureControllerMac.mm:

(WebKit::ViewGestureController::beginSwipeGesture):
Keep swipeArea in window coordinates; it was already in window coordinates
when using custom swipe views, but not in the non-custom case.

Convert from window coordinates to parent-of-m_swipeLayer coordinates when
determining m_swipeLayer's frame.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/ViewGestureControllerMac.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-08  Tim Horton  <timothy_horton@apple.com>
+
+        Snapshots can be misplaced when custom swipe views are offset from the window origin
+        https://bugs.webkit.org/show_bug.cgi?id=146744
+        <rdar://problem/20942120>
+
+        Reviewed by Dean Jackson.
+
+        * UIProcess/mac/ViewGestureControllerMac.mm:
+        (WebKit::ViewGestureController::beginSwipeGesture):
+        Keep swipeArea in window coordinates; it was already in window coordinates
+        when using custom swipe views, but not in the non-custom case.
+
+        Convert from window coordinates to parent-of-m_swipeLayer coordinates when
+        determining m_swipeLayer's frame.
+
 2015-07-07  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm

@@ -557 +557 @@
         }
     } else {
-        swipeArea = FloatRect(FloatPoint(), m_webPageProxy.viewSize());
+        swipeArea = [rootContentLayer convertRect:CGRectMake(0, 0, m_webPageProxy.viewSize().width(), m_webPageProxy.viewSize().height()) toLayer:nil];
         topContentInset = m_webPageProxy.topContentInset();
         m_currentSwipeLiveLayers.append(rootContentLayer);
@@ -580 +580 @@
     [m_swipeLayer setBackgroundColor:backgroundColor.get()];
     [m_swipeLayer setAnchorPoint:CGPointZero];
-    [m_swipeLayer setFrame:swipeArea];
+    [m_swipeLayer setFrame:[snapshotLayerParent convertRect:swipeArea fromLayer:nil]];
     [m_swipeLayer setName:@"Gesture Swipe Root Layer"];
     [m_swipeLayer setGeometryFlipped:geometryIsFlippedToRoot];
@@ -597 +597 @@
     if (m_webPageProxy.preferences().viewGestureDebuggingEnabled())
         applyDebuggingPropertiesToSwipeViews();
-
 
     CALayer *layerAdjacentToSnapshot = determineLayerAdjacentToSnapshotForParent(direction, snapshotLayerParent);