Set device scale factor even if size is empty.
Zero height panel causing early-out which caused device scale factor to be left unset (at default of 0.f) which causes DCHECKs later.
[email protected]
TEST=browser_tests on win_aura, PanelExtensionBrowserTest.*
Review URL: https://codereview.chromium.org/11414189
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169795 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index e1c7104..2350bda 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -420,12 +420,11 @@
void Compositor::SetScaleAndSize(float scale, const gfx::Size& size_in_pixel) {
DCHECK_GT(scale, 0);
- if (size_in_pixel.IsEmpty() || scale <= 0)
- return;
- size_ = size_in_pixel;
- host_->setViewportSize(size_in_pixel, size_in_pixel);
- root_web_layer_->setBounds(size_in_pixel);
-
+ if (!size_in_pixel.IsEmpty()) {
+ size_ = size_in_pixel;
+ host_->setViewportSize(size_in_pixel, size_in_pixel);
+ root_web_layer_->setBounds(size_in_pixel);
+ }
if (device_scale_factor_ != scale) {
device_scale_factor_ = scale;
if (root_layer_)
