Changeset 56630 in webkit

Timestamp:

Mar 26, 2010 9:34:12 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-26 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Pavel Feldman.

Send worker resource content to inspector to enable display of web
workers in inspector's resource tab.
​https://bugs.webkit.org/show_bug.cgi?id=36658

• inspector/InspectorController.cpp: (WebCore::InspectorController::resourceRetrievedByXMLHttpRequest): (WebCore::InspectorController::scriptImported):
• inspector/InspectorResource.cpp: (WebCore::InspectorResource::type): (WebCore::InspectorResource::setOverrideContent): (WebCore::InspectorResource::sourceString):
• inspector/InspectorResource.h:
• workers/DefaultSharedWorkerRepository.cpp: (WebCore::SharedWorkerScriptLoader::notifyFinished):
• workers/Worker.cpp: (WebCore::Worker::notifyFinished):

2010-03-26 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Pavel Feldman.

Send worker resource content to inspector to enable display of web
workers in inspector's resource tab.
​https://bugs.webkit.org/show_bug.cgi?id=36658

• src/SharedWorkerRepository.cpp: (WebCore::SharedWorkerScriptLoader::notifyFinished):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (2 diffs)
• WebCore/inspector/InspectorResource.cpp (modified) (3 diffs)
• WebCore/inspector/InspectorResource.h (modified) (2 diffs)
• WebCore/workers/DefaultSharedWorkerRepository.cpp (modified) (2 diffs)
• WebCore/workers/Worker.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/SharedWorkerRepository.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-26  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+
+        Send worker resource content to inspector to enable display of web
+        workers in inspector's resource tab.
+        https://bugs.webkit.org/show_bug.cgi?id=36658
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
+        (WebCore::InspectorController::scriptImported):
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::type):
+        (WebCore::InspectorResource::setOverrideContent):
+        (WebCore::InspectorResource::sourceString):
+        * inspector/InspectorResource.h:
+        * workers/DefaultSharedWorkerRepository.cpp:
+        (WebCore::SharedWorkerScriptLoader::notifyFinished):
+        * workers/Worker.cpp:
+        (WebCore::Worker::notifyFinished):
+
 2010-03-26  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -966 +966 @@
         return;
 
-    resource->setXMLHttpResponseText(sourceString);
+    resource->setOverrideContent(sourceString, InspectorResource::XHR);
 
     if (m_frontend)
@@ -981 +981 @@
         return;
     
-    // FIXME: imported script and XHR response are currently viewed as the same
-    // thing by the Inspector. They should be made into distinct types.
-    resource->setXMLHttpResponseText(ScriptString(sourceString));
+    resource->setOverrideContent(ScriptString(sourceString), InspectorResource::Script);
 
     if (m_frontend)

trunk/WebCore/inspector/InspectorResource.cpp

@@ -263 +263 @@
 InspectorResource::Type InspectorResource::type() const
 {
-    if (!m_xmlHttpResponseText.isNull())
-        return XHR;
+    if (!m_overrideContent.isNull())
+        return m_overrideContentType;
 
     if (m_requestURL == m_loader->requestURL()) {
@@ -280 +280 @@
 }
 
-void InspectorResource::setXMLHttpResponseText(const ScriptString& data)
-{
-    m_xmlHttpResponseText = data;
+void InspectorResource::setOverrideContent(const ScriptString& data, Type type)
+{
+    m_overrideContent = data;
+    m_overrideContentType = type;
     m_changes.set(TypeChange);
 }
@@ -288 +289 @@
 String InspectorResource::sourceString() const
 {
-    if (!m_xmlHttpResponseText.isNull())
-        return String(m_xmlHttpResponseText);
+    if (!m_overrideContent.isNull())
+        return String(m_overrideContent);
 
     String textEncodingName;

trunk/WebCore/inspector/InspectorResource.h

@@ -85 +85 @@
         void updateResponse(const ResourceResponse&);
 
-        void setXMLHttpResponseText(const ScriptString& data);
+        void setOverrideContent(const ScriptString& data, Type);
 
         String sourceString() const;
@@ -172 +172 @@
         double m_loadEventTime;
         double m_domContentEventTime;
-        ScriptString m_xmlHttpResponseText;
+        ScriptString m_overrideContent;
+        Type m_overrideContentType;
         Changes m_changes;
         bool m_isMainResource;

trunk/WebCore/workers/DefaultSharedWorkerRepository.cpp

@@ -38 +38 @@
 #include "Document.h"
 #include "GenericWorkerTask.h"
+#include "InspectorController.h"
 #include "MessageEvent.h"
 #include "MessagePort.h"
@@ -290 +291 @@
     if (m_scriptLoader->failed())
         m_worker->dispatchEvent(Event::create(eventNames().errorEvent, false, true));
-    else
+    else {
+#if ENABLE(INSPECTOR)
+        if (InspectorController* inspector = m_worker->scriptExecutionContext()->inspectorController())
+            inspector->scriptImported(m_scriptLoader->identifier(), m_scriptLoader->script());
+#endif
         DefaultSharedWorkerRepository::instance().workerScriptLoaded(*m_proxy, m_worker->scriptExecutionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), m_port.release());
-
+    }
     m_worker->unsetPendingActivity(m_worker.get());
     this->deref(); // This frees this object - must be the last action in this function.

trunk/WebCore/workers/Worker.cpp

@@ -123 +123 @@
     if (m_scriptLoader->failed())
         dispatchEvent(Event::create(eventNames().errorEvent, false, true));
-    else
+    else {
         m_contextProxy->startWorkerContext(m_scriptLoader->url(), scriptExecutionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script());
-
+#if ENABLE(INSPECTOR)
+        if (InspectorController* inspector = scriptExecutionContext()->inspectorController())
+            inspector->scriptImported(m_scriptLoader->identifier(), m_scriptLoader->script());
+#endif
+    }
     m_scriptLoader = 0;
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-26  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Send worker resource content to inspector to enable display of web
+        workers in inspector's resource tab.
+        https://bugs.webkit.org/show_bug.cgi?id=36658
+
+        * src/SharedWorkerRepository.cpp:
+        (WebCore::SharedWorkerScriptLoader::notifyFinished):
+
 2010-03-25  Tony Chang  <tony@chromium.org>
 

trunk/WebKit/chromium/src/SharedWorkerRepository.cpp

@@ -37 +37 @@
 #include "Event.h"
 #include "EventNames.h"
+#include "InspectorController.h"
 #include "MessagePortChannel.h"
 #include "PlatformMessagePortChannel.h"
@@ -153 +154 @@
         delete this;
     } else {
+#if ENABLE(INSPECTOR)
+        if (InspectorController* inspector = m_worker->scriptExecutionContext()->inspectorController())
+            inspector->scriptImported(m_scriptLoader.identifier(), m_scriptLoader.script());
+#endif
         // Pass the script off to the worker, then send a connect event.
         m_webWorker->startWorkerContext(m_url, m_name, m_worker->scriptExecutionContext()->userAgent(m_url), m_scriptLoader.script());