Changeset 64745 in webkit

Timestamp:

Aug 5, 2010 7:23:51 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-05 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Pavel Feldman.

Re-enabling inspector/extension* tests following a fix in InspectorController.
​https://bugs.webkit.org/show_bug.cgi?id=43344

• platform/gtk/Skipped:
• platform/qt/Skipped:

2010-08-05 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Separated WebInspector extension API injection logic from other scripts that inspector injects.
Enabled injection of the API scripts even if inspector is disabled for inspector front-end page.
​https://bugs.webkit.org/show_bug.cgi?id=43344

• inspector/InspectorController.cpp: (WebCore::InspectorController::inspectedWindowScriptObjectCleared): (WebCore::InspectorController::setInspectorExtensionAPI):
• inspector/InspectorController.h:
• inspector/InspectorFrontendHost.cpp: (WebCore::InspectorFrontendHost::setExtensionAPI):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (2 diffs)
• WebCore/inspector/InspectorController.h (modified) (2 diffs)
• WebCore/inspector/InspectorFrontendHost.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-05  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Re-enabling inspector/extension* tests following a fix in InspectorController.
+        https://bugs.webkit.org/show_bug.cgi?id=43344
+        
+        * platform/gtk/Skipped:
+        * platform/qt/Skipped:
+
 2010-08-05  Charles Wei  <charles.wei@torchmobile.com.cn>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -5707 +5707 @@
 inspector/timeline-script-tag-1.html
 
-# [GTK] New tests are failing at Qt/GTK(r64458):
-# Bug against caseq: https://bugs.webkit.org/show_bug.cgi?id=43344
-inspector/extensions.html
-inspector/extensions-api.html
-
-
 # Tests failing because the context menu is grabbing mouse events.
 # https://bugs.webkit.org/show_bug.cgi?id=40601

trunk/LayoutTests/platform/qt/Skipped

@@ -5412 +5412 @@
 inspector/debugger-eval-while-paused.html
 
-# [Qt] New tests are failing at Qt/GTK(r64458):
-# Bug against caseq: https://bugs.webkit.org/show_bug.cgi?id=43344
-inspector/extensions.html
-inspector/extensions-api.html
-
 # [Qt] fast/text/bidi-explicit-embedding-past-end.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=41241

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Separated WebInspector extension API injection logic from other scripts that inspector injects.
+        Enabled injection of the API scripts even if inspector is disabled for inspector front-end page.
+        https://bugs.webkit.org/show_bug.cgi?id=43344
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::inspectedWindowScriptObjectCleared):
+        (WebCore::InspectorController::setInspectorExtensionAPI):
+        * inspector/InspectorController.h:
+        * inspector/InspectorFrontendHost.cpp:
+        (WebCore::InspectorFrontendHost::setExtensionAPI):
+
 2010-08-05  Charles Wei  <charles.wei@torchmobile.com.cn>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -451 +451 @@
         m_inspectorFrontendClient->windowObjectCleared();
 
-    if (!enabled())
-        return;
-
-    if (m_frontend && frame != m_inspectedPage->mainFrame())
-        m_injectedScriptHost->discardInjectedScripts();
-    if (m_scriptsToEvaluateOnLoad.size()) {
-        ScriptState* scriptState = mainWorldScriptState(frame);
-        for (Vector<String>::iterator it = m_scriptsToEvaluateOnLoad.begin();
-             it != m_scriptsToEvaluateOnLoad.end(); ++it) {
-            m_injectedScriptHost->injectScript(*it, scriptState);
+    if (enabled()) {
+        if (m_frontend && frame == m_inspectedPage->mainFrame())
+            m_injectedScriptHost->discardInjectedScripts();
+        if (m_scriptsToEvaluateOnLoad.size()) {
+            ScriptState* scriptState = mainWorldScriptState(frame);
+            for (Vector<String>::iterator it = m_scriptsToEvaluateOnLoad.begin();
+                 it != m_scriptsToEvaluateOnLoad.end(); ++it) {
+                m_injectedScriptHost->injectScript(*it, scriptState);
+            }
         }
     }
+    if (!m_inspectorExtensionAPI.isEmpty())
+        m_injectedScriptHost->injectScript(m_inspectorExtensionAPI, mainWorldScriptState(frame));
 }
 
@@ -2162 +2163 @@
 }
 
+void InspectorController::setInspectorExtensionAPI(const String& source)
+{
+    m_inspectorExtensionAPI = source;
+}
+
 void InspectorController::getResourceContent(long callId, unsigned long identifier)
 {

trunk/WebCore/inspector/InspectorController.h

@@ -280 +280 @@
     void addScriptToEvaluateOnLoad(const String& source);
     void removeAllScriptsToEvaluateOnLoad();
+    void setInspectorExtensionAPI(const String& source);
 
     static const String& inspectorStartsAttachedSettingName();
@@ -404 +405 @@
     Vector<pair<long, String> > m_pendingEvaluateTestCommands;
     Vector<String> m_scriptsToEvaluateOnLoad;
+    String m_inspectorExtensionAPI;
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     bool m_debuggerEnabled;

trunk/WebCore/inspector/InspectorFrontendHost.cpp

@@ -196 +196 @@
 {
     InspectorController* inspector = m_frontendPage->inspectorController();
-
-    inspector->removeAllScriptsToEvaluateOnLoad();
-    inspector->addScriptToEvaluateOnLoad(script);
+    inspector->setInspectorExtensionAPI(script);
 }