Title: [135820] branches/chromium/1312/Source/WebCore/inspector
- Revision
- 135820
- Author
- [email protected]
- Date
- 2012-11-26 22:34:56 -0800 (Mon, 26 Nov 2012)
Log Message
Merge 135571 - Web Inspector: inspector overlay is always updated when inspector is open
https://bugs.webkit.org/show_bug.cgi?id=103106
Reviewed by Pavel Feldman.
Provide empty size into the InspectorOverlay if the metrics emulation is disabled,
so that it will not get painted in all cases.
* inspector/InspectorController.cpp:
(WebCore::InspectorController::webViewResized): Call InspectorPageAgent::webViewResized() rather than InspectorOverlay::resize().
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::webViewResized): Provide empty size into InspectorOverlay::resize() if device metrics are not emulated.
* inspector/InspectorPageAgent.h:
[email protected]
Review URL: https://codereview.chromium.org/11415147
Modified Paths
Diff
Modified: branches/chromium/1312/Source/WebCore/inspector/InspectorController.cpp (135819 => 135820)
--- branches/chromium/1312/Source/WebCore/inspector/InspectorController.cpp 2012-11-27 06:34:35 UTC (rev 135819)
+++ branches/chromium/1312/Source/WebCore/inspector/InspectorController.cpp 2012-11-27 06:34:56 UTC (rev 135820)
@@ -293,7 +293,7 @@
void InspectorController::webViewResized(const IntSize& size)
{
- m_overlay->resize(size);
+ m_pageAgent->webViewResized(size);
}
void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
Modified: branches/chromium/1312/Source/WebCore/inspector/InspectorPageAgent.cpp (135819 => 135820)
--- branches/chromium/1312/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-11-27 06:34:35 UTC (rev 135819)
+++ branches/chromium/1312/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-11-27 06:34:56 UTC (rev 135820)
@@ -370,6 +370,12 @@
}
}
+void InspectorPageAgent::webViewResized(const IntSize& size)
+{
+ int currentWidth = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenWidthOverride));
+ m_overlay->resize(currentWidth ? size : IntSize());
+}
+
void InspectorPageAgent::enable(ErrorString*)
{
m_enabled = true;
Modified: branches/chromium/1312/Source/WebCore/inspector/InspectorPageAgent.h (135819 => 135820)
--- branches/chromium/1312/Source/WebCore/inspector/InspectorPageAgent.h 2012-11-27 06:34:35 UTC (rev 135819)
+++ branches/chromium/1312/Source/WebCore/inspector/InspectorPageAgent.h 2012-11-27 06:34:56 UTC (rev 135820)
@@ -146,6 +146,8 @@
virtual void clearFrontend();
virtual void restore();
+ void webViewResized(const IntSize&);
+
// Cross-agents API
Frame* mainFrame();
String createIdentifier();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
