Web Inspector: Device metrics emulation should turn off when zero width and height...

https://bugs.webkit.org/show_bug.cgi?id=82907

Currently this also requires the fontScaleFactor of 1 to be passed in, too. However, it results in
downsizing the FrameView to (0x0) on navigation with the open Inspector when the emulation is disabled.

Reviewed by Yury Semikhatsky.

* src/WebDevToolsAgentImpl.cpp:
(WebKit::WebDevToolsAgentImpl::overrideDeviceMetrics):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 6a78723..ca68d14 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-02  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: Device metrics emulation should turn off when zero width and height are passed in
+        https://bugs.webkit.org/show_bug.cgi?id=82907
+
+        Currently this also requires the fontScaleFactor of 1 to be passed in, too. However, it results in
+        downsizing the FrameView to (0x0) on navigation with the open Inspector when the emulation is disabled.
+
+        Reviewed by Yury Semikhatsky.
+
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::overrideDeviceMetrics):
+
 2012-04-02  Kinuko Yasuda  <kinuko@chromium.org>
 
         Unreviewed, rolling chromium DEPS.

diff --git a/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index d297481..f742c63 100644 (file)
--- a/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -357,7 +357,7 @@ bool WebDevToolsAgentImpl::metricsOverridden()
 
 void WebDevToolsAgentImpl::overrideDeviceMetrics(int width, int height, float fontScaleFactor)
 {
-    if (!width && !height && fontScaleFactor == 1) {
+    if (!width && !height) {
         if (m_metricsSupport)
             m_metricsSupport.clear();
         return;