Title: [121342] trunk/Source/WebKit/chromium
- Revision
- 121342
- Author
- rjkro...@chromium.org
- Date
- 2012-06-27 07:55:13 -0700 (Wed, 27 Jun 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (121341 => 121342)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-27 14:27:00 UTC (rev 121341)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-27 14:55:13 UTC (rev 121342)
@@ -1,3 +1,17 @@
+2012-06-27 Robert Kroeger <rjkro...@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....@gmail.com>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (121341 => 121342)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-06-27 14:27:00 UTC (rev 121341)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-06-27 14:55:13 UTC (rev 121342)
@@ -2551,16 +2551,16 @@
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,
// as they are currently incompatible. This means the deviceScale
// 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);
- }
}
bool WebViewImpl::isFixedLayoutModeEnabled() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
