Changeset 147552 in webkit

Timestamp:

Apr 3, 2013 7:36:00 AM (11 years ago)

Author:

anilsson@rim.com

Message:

[BlackBerry] Remove defaultViewportArguments check from call site of recomputeVirtualViewportFromViewportArguments
​https://bugs.webkit.org/show_bug.cgi?id=113872

Reviewed by Carlos Garcia Campos.

Carlos pointed out that recomputeVirtualViewportFromViewportArguments
already contains the check, and returns an empty IntSize if it fails.
So pick up on that to make the code a bit more DRY.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::setViewportSize):

Location:

trunk/Source/WebKit/blackberry

Files:

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

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

@@ -3683 +3683 @@
     // Recompute our virtual viewport.
     bool needsLayout = false;
-    static ViewportArguments defaultViewportArguments;
-    if (m_viewportArguments != defaultViewportArguments) {
-        // We may need to infer the width and height for the viewport with respect to the rotation.
-        Platform::IntSize newVirtualViewport = recomputeVirtualViewportFromViewportArguments();
-        ASSERT(!newVirtualViewport.isEmpty());
+    Platform::IntSize newVirtualViewport = recomputeVirtualViewportFromViewportArguments();
+    if (!newVirtualViewport.isEmpty()) {
         m_webPage->setVirtualViewportSize(newVirtualViewport);
         m_mainFrame->view()->setUseFixedLayout(useFixedLayout());

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-03  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] Remove defaultViewportArguments check from call site of recomputeVirtualViewportFromViewportArguments
+        https://bugs.webkit.org/show_bug.cgi?id=113872
+
+        Reviewed by Carlos Garcia Campos.
+
+        Carlos pointed out that recomputeVirtualViewportFromViewportArguments
+        already contains the check, and returns an empty IntSize if it fails.
+        So pick up on that to make the code a bit more DRY.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::setViewportSize):
+
 2013-04-03  Arvid Nilsson  <anilsson@rim.com>