Changeset 147580 in webkit

Timestamp:

Apr 3, 2013 1:39:22 PM (11 years ago)

Author:

timothy@apple.com

Message:

Stop unconditionally enabling JavaScript execution when closing the Web Inspector.

​https://webkit.org/b/113889
rdar://problem/12281794

Reviewed by Joseph Pecoraro.

• inspector/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::InspectorPageAgent): Initialize m_originalScriptExecutionDisabled.
(WebCore::InspectorPageAgent::enable): Populate m_originalScriptExecutionDisabled based on current setting.
(WebCore::InspectorPageAgent::disable): Restore previous setting.

• inspector/InspectorPageAgent.h:

(InspectorPageAgent): Added m_originalScriptExecutionDisabled.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorPageAgent.cpp (modified) (3 diffs)
• inspector/InspectorPageAgent.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-03  Timothy Hatcher  <timothy@apple.com>
+
+        Stop unconditionally enabling JavaScript execution when closing the Web Inspector.
+
+        https://webkit.org/b/113889
+        rdar://problem/12281794
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::InspectorPageAgent): Initialize m_originalScriptExecutionDisabled.
+        (WebCore::InspectorPageAgent::enable): Populate m_originalScriptExecutionDisabled based on current setting.
+        (WebCore::InspectorPageAgent::disable): Restore previous setting.
+        * inspector/InspectorPageAgent.h:
+        (InspectorPageAgent): Added m_originalScriptExecutionDisabled.
+
 2013-04-03  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -344 +344 @@
     , m_enabled(false)
     , m_isFirstLayoutAfterOnLoad(false)
+    , m_originalScriptExecutionDisabled(false)
     , m_geolocationOverridden(false)
     , m_ignoreScriptsEnabledNotification(false)
@@ -404 +405 @@
     m_state->setBoolean(PageAgentState::pageAgentEnabled, true);
     m_instrumentingAgents->setInspectorPageAgent(this);
+
+    if (Frame* frame = mainFrame()) {
+        if (Settings* settings = frame->settings())
+            m_originalScriptExecutionDisabled = !settings->isScriptEnabled();
+    }
 }
 
@@ -413 +419 @@
     m_instrumentingAgents->setInspectorPageAgent(0);
 
-    setScriptExecutionDisabled(0, false);
+    setScriptExecutionDisabled(0, m_originalScriptExecutionDisabled);
     setShowPaintRects(0, false);
     setShowDebugBorders(0, false);

trunk/Source/WebCore/inspector/InspectorPageAgent.h

@@ -208 +208 @@
     bool m_enabled;
     bool m_isFirstLayoutAfterOnLoad;
+    bool m_originalScriptExecutionDisabled;
     bool m_geolocationOverridden;
     bool m_ignoreScriptsEnabledNotification;