Changeset 169068 in webkit

Timestamp:

May 19, 2014, 2:42:38 PM (12 years ago)

Author:

benjamin@webkit.org

Message:

[iOS][WK2] When a page relayout on dynamic resize, keep the same relative width in view
​https://bugs.webkit.org/show_bug.cgi?id=133026
<rdar://problem/16833971>

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-05-19
Reviewed by Simon Fraser.

When a page does not relayout, we keep the same width in view.
When a page relayout, we should keep the same relative width in view.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::isResponsiveDesignWithContentLargerThanLayout):
(WebKit::WebPage::dynamicViewportSizeUpdate):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-19  Benjamin Poulain  <bpoulain@apple.com>
+
+        [iOS][WK2] When a page relayout on dynamic resize, keep the same relative width in view
+        https://bugs.webkit.org/show_bug.cgi?id=133026
+        <rdar://problem/16833971>
+
+        Reviewed by Simon Fraser.
+
+        When a page does not relayout, we keep the same width in view.
+        When a page relayout, we should keep the same relative width in view.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::isResponsiveDesignWithContentLargerThanLayout):
+        (WebKit::WebPage::dynamicViewportSizeUpdate):
+
 2014-05-19  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -1942 +1942 @@
 
     RefPtr<Node> oldNodeAtCenter;
+    double visibleHorizontalFraction = 1;
     float relativeHorizontalPositionInNodeAtCenter = 0;
     float relativeVerticalPositionInNodeAtCenter = 0;
     {
         IntRect unobscuredContentRect = frameView.unobscuredContentRect();
+        visibleHorizontalFraction = static_cast<float>(unobscuredContentRect.width()) / oldContentSize.width();
         IntPoint unobscuredContentRectCenter = unobscuredContentRect.center();
 
@@ -1978 +1980 @@
     else
         scale = std::max(std::min(targetScale, m_viewportConfiguration.maximumScale()), m_viewportConfiguration.minimumScale());
+
+    if (m_userHasChangedPageScaleFactor && newContentSize.width() != oldContentSize.width()) {
+        // When the content size change, we keep the same relative horizontal content width in view, otherwise we would
+        // end up zoom to far in landscape->portrait, and too close in portrait->landscape.
+        float widthToKeepInView = visibleHorizontalFraction * newContentSize.width();
+        double newScale = targetUnobscuredRectInScrollViewCoordinates.width() / widthToKeepInView;
+        scale = std::max(std::min(newScale, m_viewportConfiguration.maximumScale()), m_viewportConfiguration.minimumScale());
+    }
 
     FloatRect newUnobscuredContentRect = targetUnobscuredRect;