Changeset 187330 in webkit

Timestamp:

Jul 24, 2015, 12:54:58 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187286. rdar://problem/21953359

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  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187286. rdar://problem/21953359
+
+    2015-07-23  Zalan Bujtas  <zalan@apple.com>
+
+            [iOS] REGRESSION (187131): Loading CuteOverload zooms in to the top left corner.
+            https://bugs.webkit.org/show_bug.cgi?id=147251
+            rdar://problem/21953359
+
+            Calling zoomToRect() should result in essentially the same zoom scale as if we
+            called setZoomScale with the new page scale factor.
+
+            Reviewed by Benjamin Poulain.
+
+            * UIProcess/API/Cocoa/WKWebView.mm:
+            (-[WKWebView _didCommitLayerTree:]):
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

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

@@ -968 +968 @@
             if (!oldUnobscuredContentRect.isEmpty() && oldUnobscuredContentRect.y() < 1) {
                 CGFloat relativeHorizontalPosition = oldUnobscuredContentRect.x() / oldUnobscuredContentRect.width();
-                CGPoint newTopLeft = [self _adjustedContentOffset: { relativeHorizontalPosition * newContentSize.width, 0 }];
+                CGPoint newTopLeft = { relativeHorizontalPosition * newContentSize.width, 0 };
                 CGSize scrollViewSize = [_scrollView bounds].size;
-                CGSize rectToZoomSize = CGSizeMake(scrollViewSize.width * newPageScaleFactor, scrollViewSize.height * newPageScaleFactor);
+                CGSize rectToZoomSize = CGSizeMake(scrollViewSize.width / newPageScaleFactor, scrollViewSize.height / newPageScaleFactor);
                 [_scrollView zoomToRect: { newTopLeft, rectToZoomSize } animated:NO];
+                ASSERT(areEssentiallyEqualAsFloat(newPageScaleFactor, contentZoomScale(self)));
             } else
                 [_scrollView setZoomScale:newPageScaleFactor];