[chromium] out-of-order assert in WebViewImpl setDeviceScaleFactor
authorrjkroege@chromium.org <rjkroege@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jun 2012 14:55:13 +0000 (14:55 +0000)
committerrjkroege@chromium.org <rjkroege@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jun 2012 14:55:13 +0000 (14:55 +0000)
commit673355c084d335468eb7381dd282af4260c4bdd9
tree6b1e41c7dcf44ee8a00f7c3688c6e1b882c18bce
parentd1e49158259811f150957b161bbe20be26b790bc
[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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121342 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/WebViewImpl.cpp