Changeset 187306 in webkit

Timestamp:

Jul 24, 2015, 12:06:01 AM (11 years ago)

Author:

Lucas Forschler

Message:

Merged r187131. rdar://problem/21046961

Location:

branches/safari-601.1-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

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

@@ +1 @@
+2015-07-24  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r187131
+
+    2015-07-21  Zalan Bujtas  <zalan@apple.com>
+
+            [iOS] Menu drop down such as on nike.com does not stay
+            https://bugs.webkit.org/show_bug.cgi?id=147047
+            rdar://problem/21046961
+
+            Reviewed by Benjamin Poulain.
+
+            This is a workaround for unintended scrolling while scaling.
+            (Based on Benjamin Poulain's WIP patch for webkit.org/b/136904)
+
+            In certain cases when scaling would result in moving the scrollview (which would trigger
+            a scroll event on WebCore side), zoomRect is called instead of setZoomScale to ensure
+            that the scroll position stays intact.
+
+            * UIProcess/API/Cocoa/WKWebView.mm:
+            (-[WKWebView _didCommitLayerTree:]):
+
 2015-07-24  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -960 +960 @@
     [_scrollView setMaximumZoomScale:layerTreeTransaction.maximumScaleFactor()];
     [_scrollView setZoomEnabled:layerTreeTransaction.allowsUserScaling()];
-    if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom])
-        [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
+    if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom]) {
+        float newPageScaleFactor = layerTreeTransaction.pageScaleFactor();
+
+        if (!areEssentiallyEqualAsFloat(contentZoomScale(self), newPageScaleFactor)) {
+            // FIXME: We need to handle stick to bottom.
+            WebCore::FloatRect oldUnobscuredContentRect = _page->unobscuredContentRect();
+            if (!oldUnobscuredContentRect.isEmpty() && oldUnobscuredContentRect.y() < 1) {
+                CGFloat relativeHorizontalPosition = oldUnobscuredContentRect.x() / oldUnobscuredContentRect.width();
+                CGPoint newTopLeft = [self _adjustedContentOffset: { relativeHorizontalPosition * newContentSize.width, 0 }];
+                CGSize scrollViewSize = [_scrollView bounds].size;
+                CGSize rectToZoomSize = CGSizeMake(scrollViewSize.width * newPageScaleFactor, scrollViewSize.height * newPageScaleFactor);
+                [_scrollView zoomToRect: { newTopLeft, rectToZoomSize } animated:NO];
+            } else
+                [_scrollView setZoomScale:newPageScaleFactor];
+        }
+    }
 
     [self _updateScrollViewBackground];