Title: [134917] trunk/Source/WebCore
- Revision
- 134917
- Author
- apav...@chromium.org
- Date
- 2012-11-16 01:22:10 -0800 (Fri, 16 Nov 2012)
Log Message
Web Inspector: [Overrides] Device metrics get reset on navigation, yet remain in the Overrides view
https://bugs.webkit.org/show_bug.cgi?id=102467
Reviewed by Pavel Feldman.
Restore the device metrics overrides from the inspector cookie in InspectorPageAgent::restore().
Drive-by: move the script execution and FPS counter display state restoration from enable() into restore(),
so that they will get restored only upon page navigation, not upon any agent enablement.
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::restore): Restore device metrics overrides, script execution and FPS counter display state.
(WebCore::InspectorPageAgent::enable): Don't restore script execution and FPS counter display state on any enablement.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134916 => 134917)
--- trunk/Source/WebCore/ChangeLog 2012-11-16 09:19:19 UTC (rev 134916)
+++ trunk/Source/WebCore/ChangeLog 2012-11-16 09:22:10 UTC (rev 134917)
@@ -1,3 +1,18 @@
+2012-11-16 Alexander Pavlov <apav...@chromium.org>
+
+ Web Inspector: [Overrides] Device metrics get reset on navigation, yet remain in the Overrides view
+ https://bugs.webkit.org/show_bug.cgi?id=102467
+
+ Reviewed by Pavel Feldman.
+
+ Restore the device metrics overrides from the inspector cookie in InspectorPageAgent::restore().
+ Drive-by: move the script execution and FPS counter display state restoration from enable() into restore(),
+ so that they will get restored only upon page navigation, not upon any agent enablement.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::restore): Restore device metrics overrides, script execution and FPS counter display state.
+ (WebCore::InspectorPageAgent::enable): Don't restore script execution and FPS counter display state on any enablement.
+
2012-11-16 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r134908.
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (134916 => 134917)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-11-16 09:19:19 UTC (rev 134916)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-11-16 09:22:10 UTC (rev 134917)
@@ -357,6 +357,16 @@
if (m_state->getBoolean(PageAgentState::pageAgentEnabled)) {
ErrorString error;
enable(&error);
+ bool scriptExecutionDisabled = m_state->getBoolean(PageAgentState::pageAgentScriptExecutionDisabled);
+ setScriptExecutionDisabled(0, scriptExecutionDisabled);
+ bool showFPSCounter = m_state->getBoolean(PageAgentState::pageAgentShowFPSCounter);
+ setShowFPSCounter(0, showFPSCounter);
+
+ int currentWidth = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenWidthOverride));
+ int currentHeight = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenHeightOverride));
+ double currentFontScaleFactor = m_state->getDouble(PageAgentState::pageAgentFontScaleFactorOverride);
+ bool currentFitWindow = m_state->getBoolean(PageAgentState::pageAgentFitWindow);
+ updateViewMetrics(currentWidth, currentHeight, currentFontScaleFactor, currentFitWindow);
#if ENABLE(TOUCH_EVENTS)
updateTouchEventEmulationInPage(m_state->getBoolean(PageAgentState::touchEventEmulationEnabled));
#endif
@@ -367,10 +377,6 @@
{
m_enabled = true;
m_state->setBoolean(PageAgentState::pageAgentEnabled, true);
- bool scriptExecutionDisabled = m_state->getBoolean(PageAgentState::pageAgentScriptExecutionDisabled);
- setScriptExecutionDisabled(0, scriptExecutionDisabled);
- bool showFPSCounter = m_state->getBoolean(PageAgentState::pageAgentShowFPSCounter);
- setShowFPSCounter(0, showFPSCounter);
m_instrumentingAgents->setInspectorPageAgent(this);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
