Changeset 121342 in webkit

Timestamp:

Jun 27, 2012, 7:55:13 AM (13 years ago)

Author:

rjkroege@chromium.org

Message:

[chromium] out-of-order assert in WebViewImpl setDeviceScaleFactor
​https://bugs.webkit.org/show_bug.cgi?id=90006

The assert in WebViewImpl::setDeviceScaleFactor should test for non-scaling
after we have set both m_DeviceScaleInCompositor and page()->deviceScaleFactor()
instead of in between.

Reviewed by James Robinson.

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::setDeviceScaleFactor):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-27  Robert Kroeger  <rjkroege@chromium.org>
+
+        [chromium] out-of-order assert in WebViewImpl setDeviceScaleFactor
+        https://bugs.webkit.org/show_bug.cgi?id=90006
+
+        The assert in WebViewImpl::setDeviceScaleFactor should test for non-scaling
+        after we have set both m_DeviceScaleInCompositor and page()->deviceScaleFactor()
+        instead of in between.
+
+        Reviewed by James Robinson.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setDeviceScaleFactor):
+
 2012-06-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -2552 +2552 @@
     page()->setDeviceScaleFactor(scaleFactor);
 
+    if (!m_layerTreeView.isNull() && m_webSettings->applyDefaultDeviceScaleFactorInCompositor()) {
+        m_deviceScaleInCompositor = page()->deviceScaleFactor();
+        m_layerTreeView.setDeviceScaleFactor(m_deviceScaleInCompositor);
+    }
     if (m_deviceScaleInCompositor != 1) {
         // Don't allow page scaling when compositor scaling is being used,
@@ -2557 +2561 @@
         // needs to match the one in the compositor.
         ASSERT(scaleFactor == m_deviceScaleInCompositor);
-    }
-    if (!m_layerTreeView.isNull() && m_webSettings->applyDefaultDeviceScaleFactorInCompositor()) {
-        m_deviceScaleInCompositor = page()->deviceScaleFactor();
-        m_layerTreeView.setDeviceScaleFactor(m_deviceScaleInCompositor);
     }
 }