Changeset 118895 in webkit

Timestamp:

May 29, 2012 11:17:46 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] The Page's deviceScaleFactor() is not being properly maintained
​https://bugs.webkit.org/show_bug.cgi?id=87817

Patch by Max Feil <​mfeil@rim.com> on 2012-05-29
Reviewed by Antonio Gomes.

This bug fix in WebKit/blackberry is needed by the changes for
fullscreen media control sizing in WebCore (bug 87551). The sizing
of controls depends on the page's deviceScaleFactor(), which was
not being maintained properly due to errors in logic. Viewport
changes from non-default to default were being erroneously
thrown out. Also, when the viewport did change back to default
the deviceScaleFactor was not being updated.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::recomputeVirtualViewportFromViewportArguments):
(BlackBerry::WebKit::WebPagePrivate::dispatchViewportPropertiesDidChange):

Location:

trunk/Source/WebKit/blackberry

Files:

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

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

@@ -3359 +3359 @@
 {
     static const ViewportArguments defaultViewportArguments;
-    if (m_viewportArguments == defaultViewportArguments)
+    if (m_viewportArguments == defaultViewportArguments) {
+        m_page->setDeviceScaleFactor(1.0);
         return IntSize();
+    }
 
     int desktopWidth = defaultMaxLayoutSize().width();
@@ -3398 +3400 @@
 void WebPagePrivate::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments)
 {
-    static ViewportArguments defaultViewportArguments;
-    if (arguments == defaultViewportArguments)
+    if (arguments == m_viewportArguments)
         return;
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-05-29  Max Feil  <mfeil@rim.com>
+
+        [BlackBerry] The Page's deviceScaleFactor() is not being properly maintained
+        https://bugs.webkit.org/show_bug.cgi?id=87817
+
+        Reviewed by Antonio Gomes.
+
+        This bug fix in WebKit/blackberry is needed by the changes for
+        fullscreen media control sizing in WebCore (bug 87551). The sizing
+        of controls depends on the page's deviceScaleFactor(), which was
+        not being maintained properly due to errors in logic. Viewport
+        changes from non-default to default were being erroneously
+        thrown out. Also, when the viewport did change back to default
+        the deviceScaleFactor was not being updated.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::recomputeVirtualViewportFromViewportArguments):
+        (BlackBerry::WebKit::WebPagePrivate::dispatchViewportPropertiesDidChange):
+
 2012-05-29  Arvid Nilsson  <anilsson@rim.com>