Title: [149542] trunk/Source/WebKit/blackberry
Revision
149542
Author
[email protected]
Date
2013-05-03 15:19:15 -0700 (Fri, 03 May 2013)

Log 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 <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (149541 => 149542)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-05-03 22:14:42 UTC (rev 149541)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-05-03 22:19:15 UTC (rev 149542)
@@ -1112,12 +1112,13 @@
             } else {
                 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)
             didReceiveCursorEventMode(ProcessedCursorEvents);
             didReceiveTouchEventMode(ProcessedTouchEvents);

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149541 => 149542)


--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-03 22:14:42 UTC (rev 149541)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-03 22:19:15 UTC (rev 149542)
@@ -1,3 +1,25 @@
+2013-05-03  Jacky Jiang  <[email protected]>
+
+        [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  <[email protected]>
 
         [BlackBerry] Cannot touch scroll readonly text input.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to