Changeset 167615 in webkit

Timestamp:

Apr 21, 2014 1:14:05 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

[iOS][WK2] Fix the dynamic viewport update when the viewport's max-scale conflict with the transition
​https://bugs.webkit.org/show_bug.cgi?id=131884

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-04-21
Reviewed by Darin Adler.

<rdar://problem/16667291>

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _beginAnimatedResizeWithUpdates:]):
It is fairly common to have a viewport configuration with min-scale=1 and max-scale=1.
Since we were only changing the minimumScale for the transition, the target scale was affected
by max-scale. This was breaking the transition from portrait to landscale.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-21  Benjamin Poulain  <bpoulain@apple.com>
+
+        [iOS][WK2] Fix the dynamic viewport update when the viewport's max-scale conflict with the transition
+        https://bugs.webkit.org/show_bug.cgi?id=131884
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/16667291>
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+        It is fairly common to have a viewport configuration with min-scale=1 and max-scale=1.
+        Since we were only changing the minimumScale for the transition, the target scale was affected
+        by max-scale. This was breaking the transition from portrait to landscale.
+
 2014-04-21  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1338 +1338 @@
     CGSize contentSizeInContentViewCoordinates = [_contentView bounds].size;
     [_scrollView setMinimumZoomScale:std::min(newBounds.size.width / contentSizeInContentViewCoordinates.width, [_scrollView minimumZoomScale])];
+    [_scrollView setMaximumZoomScale:std::max(newBounds.size.width / contentSizeInContentViewCoordinates.width, [_scrollView maximumZoomScale])];
 
     // Compute the new scale to keep the current content width in the scrollview.