Changeset 142654 in webkit

Timestamp:

Feb 12, 2013 12:45:44 PM (11 years ago)

Author:

vivek.vg@samsung.com

Message:

Web Inspector: JavaScript execution disabled by browser/UA should be notified to the front-end
​https://bugs.webkit.org/show_bug.cgi?id=109402

Reviewed by Yury Semikhatsky.

Source/WebCore:

Whenever the UA/Browser changes the Script Execution state of a page, it should notify the
inspector front-end. Added the InspectorInstrumentation method didScriptExecutionStateChange
to achieve this. Also the state change triggered by the inspector should be ignored to avoid
infinite loop.

Test: inspector/script-execution-state-change-notification.html

• inspector/Inspector.json:
• inspector/InspectorInstrumentation.cpp:

(WebCore):
(WebCore::InspectorInstrumentation::scriptsEnabledImpl):

• inspector/InspectorInstrumentation.h:

(InspectorInstrumentation):
(WebCore::InspectorInstrumentation::scriptsEnabled):
(WebCore):

• inspector/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::InspectorPageAgent):
(WebCore::InspectorPageAgent::setScriptExecutionDisabled):
(WebCore::InspectorPageAgent::scriptsEnabled):
(WebCore):

• inspector/InspectorPageAgent.h:

(InspectorPageAgent):

• inspector/front-end/ResourceTreeModel.js:

(WebInspector.PageDispatcher.prototype.javascriptDialogClosed):
(WebInspector.PageDispatcher.prototype.scriptsEnabled):

• page/Settings.cpp:

(WebCore::Settings::setScriptEnabled):

LayoutTests:

Tests that whenever Script Execution state is changed outside inspector, its notified to the Inspector front-end.

• inspector/script-execution-state-change-notification-expected.txt: Added.
• inspector/script-execution-state-change-notification.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/script-execution-state-change-notification-expected.txt (added)
• LayoutTests/inspector/script-execution-state-change-notification.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/Inspector.json (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.h (modified) (3 diffs)
• Source/WebCore/inspector/InspectorPageAgent.cpp (modified) (3 diffs)
• Source/WebCore/inspector/InspectorPageAgent.h (modified) (2 diffs)
• Source/WebCore/inspector/front-end/ResourceTreeModel.js (modified) (1 diff)
• Source/WebCore/page/Settings.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-12  Vivek Galatage  <vivek.vg@samsung.com>
+
+        Web Inspector: JavaScript execution disabled by browser/UA should be notified to the front-end
+        https://bugs.webkit.org/show_bug.cgi?id=109402
+
+        Reviewed by Yury Semikhatsky.
+
+        Tests that whenever Script Execution state is changed outside inspector, its notified to the Inspector front-end.
+
+        * inspector/script-execution-state-change-notification-expected.txt: Added.
+        * inspector/script-execution-state-change-notification.html: Added.
+
 2013-02-12  Uday Kiran  <udaykiran@motorola.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -305 +305 @@
 # https://bugs.webkit.org/show_bug.cgi?id=96942
 http/tests/inspector/network/network-xhr-replay.html
+
+webkit.org/b/109546 inspector/script-execution-state-change-notification.html [ Skip ]
 
 # Safari doesn't allow to customize outermost scrollbars.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-12  Vivek Galatage  <vivek.vg@samsung.com>
+
+        Web Inspector: JavaScript execution disabled by browser/UA should be notified to the front-end
+        https://bugs.webkit.org/show_bug.cgi?id=109402
+
+        Reviewed by Yury Semikhatsky.
+
+        Whenever the UA/Browser changes the Script Execution state of a page, it should notify the
+        inspector front-end. Added the InspectorInstrumentation method didScriptExecutionStateChange
+        to achieve this. Also the state change triggered by the inspector should be ignored to avoid
+        infinite loop.
+
+        Test: inspector/script-execution-state-change-notification.html
+
+        * inspector/Inspector.json:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore):
+        (WebCore::InspectorInstrumentation::scriptsEnabledImpl):
+        * inspector/InspectorInstrumentation.h:
+        (InspectorInstrumentation):
+        (WebCore::InspectorInstrumentation::scriptsEnabled):
+        (WebCore):
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::InspectorPageAgent):
+        (WebCore::InspectorPageAgent::setScriptExecutionDisabled):
+        (WebCore::InspectorPageAgent::scriptsEnabled):
+        (WebCore):
+        * inspector/InspectorPageAgent.h:
+        (InspectorPageAgent):
+        * inspector/front-end/ResourceTreeModel.js:
+        (WebInspector.PageDispatcher.prototype.javascriptDialogClosed):
+        (WebInspector.PageDispatcher.prototype.scriptsEnabled):
+        * page/Settings.cpp:
+        (WebCore::Settings::setScriptEnabled):
+
 2013-02-12  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -559 +559 @@
                 "name": "javascriptDialogClosed",
                 "description": "Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) has been closed.",
+                "hidden": true
+            },
+            {
+                "name": "scriptsEnabled",
+                "description": "Fired when the JavaScript is enabled/disabled on the page",
+                "parameters": [
+                    { "name": "isEnabled", "type": "boolean", "description": "Whether script execution is enabled or disabled on the page." }
+                ],
                 "hidden": true
             }

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -448 +448 @@
 }
 
+void InspectorInstrumentation::scriptsEnabledImpl(InstrumentingAgents* instrumentingAgents, bool isEnabled)
+{
+    if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent())
+        pageAgent->scriptsEnabled(isEnabled);
+}
+
 void InspectorInstrumentation::didCreateIsolatedContextImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, ScriptState* scriptState, SecurityOrigin* origin)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -153 +153 @@
     static InspectorInstrumentationCookie willEvaluateScript(Frame*, const String& url, int lineNumber);
     static void didEvaluateScript(const InspectorInstrumentationCookie&);
+    static void scriptsEnabled(Page*, bool isEnabled);
     static void didCreateIsolatedContext(Frame*, ScriptState*, SecurityOrigin*);
     static InspectorInstrumentationCookie willFireTimer(ScriptExecutionContext*, int timerId);
@@ -357 +358 @@
     static InspectorInstrumentationCookie willEvaluateScriptImpl(InstrumentingAgents*, const String& url, int lineNumber, Frame*);
     static void didEvaluateScriptImpl(const InspectorInstrumentationCookie&);
+    static void scriptsEnabledImpl(InstrumentingAgents*, bool isEnabled);
     static void didCreateIsolatedContextImpl(InstrumentingAgents*, Frame*, ScriptState*, SecurityOrigin*);
     static InspectorInstrumentationCookie willFireTimerImpl(InstrumentingAgents*, int timerId, ScriptExecutionContext*);
@@ -967 +969 @@
 }
 
+inline void InspectorInstrumentation::scriptsEnabled(Page* page, bool isEnabled)
+{
+    FAST_RETURN_IF_NO_FRONTENDS(void());
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
+        return scriptsEnabledImpl(instrumentingAgents, isEnabled);
+}
+
 inline void InspectorInstrumentation::didCreateIsolatedContext(Frame* frame, ScriptState* scriptState, SecurityOrigin* origin)
 {

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -338 +338 @@
     , m_isFirstLayoutAfterOnLoad(false)
     , m_geolocationOverridden(false)
+    , m_ignoreScriptsEnabledNotification(false)
 {
 }
@@ -813 +814 @@
 
     Settings* settings = mainFrame()->settings();
-    if (settings)
+    if (settings) {
+        m_ignoreScriptsEnabledNotification = true;
         settings->setScriptEnabled(!value);
+        m_ignoreScriptsEnabledNotification = false;
+    }
 }
 
@@ -1028 +1032 @@
     if (m_enabled)
         m_overlay->update();
+}
+
+void InspectorPageAgent::scriptsEnabled(bool isEnabled)
+{
+    if (m_ignoreScriptsEnabledNotification)
+        return;
+
+    m_frontend->scriptsEnabled(isEnabled);
 }
 

trunk/Source/WebCore/inspector/InspectorPageAgent.h

@@ -157 +157 @@
     void didScroll();
     void didRecalculateStyle();
+    void scriptsEnabled(bool isEnabled);
 
     // Inspector Controller API
@@ -206 +207 @@
     bool m_isFirstLayoutAfterOnLoad;
     bool m_geolocationOverridden;
+    bool m_ignoreScriptsEnabledNotification;
     RefPtr<GeolocationPosition> m_geolocationPosition;
     RefPtr<GeolocationPosition> m_platformGeolocationPosition;

trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js

@@ -626 +626 @@
     javascriptDialogClosed: function()
     {
+    },
+
+    scriptsEnabled: function(isEnabled)
+    {
+        WebInspector.settings.javaScriptDisabled.set(!isEnabled);
     }
 }

trunk/Source/WebCore/page/Settings.cpp

@@ -38 +38 @@
 #include "HTMLMediaElement.h"
 #include "HistoryItem.h"
+#include "InspectorInstrumentation.h"
 #include "Page.h"
 #include "PageCache.h"
@@ -416 +417 @@
 {
     m_isScriptEnabled = isScriptEnabled;
+    InspectorInstrumentation::scriptsEnabled(m_page, m_isScriptEnabled);
 }