Changeset 149542 in webkit

Timestamp:

May 3, 2013 3:19:15 PM (11 years ago)

Author:

zhajiang@rim.com

Message:

[BlackBerry] Page rendering scale is changed after go back and forward
​https://bugs.webkit.org/show_bug.cgi?id=115573

Patch by Jacky Jiang <​zhajiang@blackberry.com> on 2013-05-03.
Reviewed by Rob Buis.
Internally reviewed by Jeff Rogers.

PR: 326886
When navigating back from page A with viewport to page B without
viewport, we didn't call setViewMode(); therefore, we didn't change
the fixed layout size which was set by page A. In that case, WebCore
would just pick up page A's fixed layout size to layout page B which
caused this issue.
Expecting zoomToInitialScaleOnLoad() or other functions to setViewMode()
later is not a good way, because zoomToInitialScaleOnLoad() has never
been called in this case. So we should always call setViewMode() to set
fixed layout size when a new page is committed.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::setLoadState):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -1113 +1113 @@
                 Platform::IntSize virtualViewport = recomputeVirtualViewportFromViewportArguments();
                 m_webPage->setVirtualViewportSize(virtualViewport);
-                if (m_shouldUseFixedDesktopMode)
-                    setViewMode(FixedDesktop);
-                else
-                    setViewMode(Desktop);
             }
+
+            if (m_shouldUseFixedDesktopMode)
+                setViewMode(FixedDesktop);
+            else
+                setViewMode(Desktop);
 
 #if ENABLE(EVENT_MODE_METATAGS)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-03  Jacky Jiang  <zhajiang@blackberry.com>
+
+        [BlackBerry] Page rendering scale is changed after go back and forward
+        https://bugs.webkit.org/show_bug.cgi?id=115573
+
+        Reviewed by Rob Buis.
+        Internally reviewed by Jeff Rogers.
+
+        PR: 326886
+        When navigating back from page A with viewport to page B without
+        viewport, we didn't call setViewMode(); therefore, we didn't change
+        the fixed layout size which was set by page A. In that case, WebCore
+        would just pick up page A's fixed layout size to layout page B which
+        caused this issue.
+        Expecting zoomToInitialScaleOnLoad() or other functions to setViewMode()
+        later is not a good way, because zoomToInitialScaleOnLoad() has never
+        been called in this case. So we should always call setViewMode() to set
+        fixed layout size when a new page is committed.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::setLoadState):
+
 2013-05-02  Genevieve Mak  <gmak@rim.com>