Changeset 127628 in webkit

Timestamp:

Sep 5, 2012 12:17:30 PM (12 years ago)

Author:

leoyang@rim.com

Message:

[BlackBerry] Rotation and then reload causes less sized webpage (PR 190469)
​https://bugs.webkit.org/show_bug.cgi?id=95870

Reviewed by George Staikos.
Reviewed internally by Jacky Jiang.

Use the new zoom to fit scale if the page was zoomed to fit initial scale
When a page is reloaded the layout size may be changed. So the contents
size on which the initial scale depends may be changed. Use the new initial
scale in this case to make sure the page will be zoomed to correct scale.

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::restoreViewState):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-09-05  Leo Yang  <leoyang@rim.com>
+
+        [BlackBerry] Rotation and then reload causes less sized webpage (PR 190469)
+        https://bugs.webkit.org/show_bug.cgi?id=95870
+
+        Reviewed by George Staikos.
+        Reviewed internally by Jacky Jiang.
+
+        Use the new zoom to fit scale if the page was zoomed to fit initial scale
+        When a page is reloaded the layout size may be changed. So the contents
+        size on which the initial scale depends may be changed. Use the new initial
+        scale in this case to make sure the page will be zoomed to correct scale.
+
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::restoreViewState):
+
 2012-09-05  Robin Cao  <robin.cao@torchmobile.com.cn>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

@@ -1077 +1077 @@
     m_webPagePrivate->m_maximumScale = viewState.maximumScale;
     m_webPagePrivate->m_userScalable = viewState.isUserScalable;
+
     // Also, try to keep the users zoom if any.
     double scale = viewState.scale;
+
+    // If it was zoomToFitScale use the new zoomToFitScale because
+    // the new one may be different to the old one due to contents
+    // size change (e.g. after reloaded).
+    if (viewState.isZoomToFitScale)
+        scale = m_webPagePrivate->zoomToFitScale();
+
     bool shouldReflowBlock = viewState.shouldReflowBlock;
     if (m_webPagePrivate->m_userPerformedManualZoom) {