Diff
Modified: trunk/LayoutTests/ChangeLog (92780 => 92781)
--- trunk/LayoutTests/ChangeLog 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/LayoutTests/ChangeLog 2011-08-10 18:45:25 UTC (rev 92781)
@@ -1,5 +1,21 @@
2011-08-10 Vsevolod Vlasov <[email protected]>
+ Web Inspector: Remove Network.initialContentSet from protocol, store workers content on backend.
+ https://bugs.webkit.org/show_bug.cgi?id=65929
+
+ Reviewed by Pavel Feldman.
+
+ * http/tests/inspector/network/network-shared-worker-expected.txt: Added.
+ * http/tests/inspector/network/network-shared-worker.html: Added.
+ * http/tests/inspector/network/network-worker-expected.txt: Added.
+ * http/tests/inspector/network/network-worker.html: Added.
+ * http/tests/inspector/network/resources/shared-worker.js: Added.
+ (onconnect):
+ * http/tests/inspector/network/resources/worker.js: Added.
+ * platform/chromium/test_expectations.txt:
+
+2011-08-10 Vsevolod Vlasov <[email protected]>
+
Web Inspector: console messages markers are lost in Resources panel after page reload
https://bugs.webkit.org/show_bug.cgi?id=60701
Added: trunk/LayoutTests/http/tests/inspector/network/network-shared-worker-expected.txt (0 => 92781)
--- trunk/LayoutTests/http/tests/inspector/network/network-shared-worker-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/network-shared-worker-expected.txt 2011-08-10 18:45:25 UTC (rev 92781)
@@ -0,0 +1,15 @@
+CONSOLE MESSAGE: line 14: Done.
+Tests that shared worker content is available in network panel.
+
+Bug 65929
+http://127.0.0.1:8000/inspector/network/resources/shared-worker.js
+resource.type: 4
+resource.content before requesting content: undefined
+resource.content after requesting content: _onconnect_ = function(event)
+{
+ var port = event.ports[0];
+ port.postMessage("Done.");
+}
+
+
+
Property changes on: trunk/LayoutTests/http/tests/inspector/network/network-shared-worker-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/http/tests/inspector/network/network-shared-worker.html (0 => 92781)
--- trunk/LayoutTests/http/tests/inspector/network/network-shared-worker.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/network-shared-worker.html 2011-08-10 18:45:25 UTC (rev 92781)
@@ -0,0 +1,52 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+function loadData()
+{
+ var worker = new SharedWorker("resources/shared-worker.js");
+ worker.port._onmessage_ = workerLoaded;
+}
+
+function workerLoaded(event)
+{
+ console.log(event.data);
+}
+
+function test()
+{
+ // Since this test could be run together with other inspector backend cache
+ // tests, we need to reset size limits to default ones.
+ InspectorTest.resetInspectorResourcesData(step1);
+
+ function step1()
+ {
+ InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
+ InspectorTest.evaluateInPage("loadData()");
+ }
+
+ function step2()
+ {
+ var resource1 = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
+ InspectorTest.addResult(resource1.url);
+ InspectorTest.addResult("resource.type: " + resource1.type);
+ InspectorTest.addResult("resource.content before requesting content: " + resource1.content);
+ resource1.requestContent(step3);
+ }
+
+ function step3()
+ {
+ var resource1 = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
+ InspectorTest.addResult("resource.content after requesting content: " + resource1.content);
+
+ InspectorTest.completeTest();
+ }
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests that shared worker content is available in network panel.</p>
+<a href="" 65929</a>
+</body>
+</html>
Property changes on: trunk/LayoutTests/http/tests/inspector/network/network-shared-worker.html
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/http/tests/inspector/network/network-worker-expected.txt (0 => 92781)
--- trunk/LayoutTests/http/tests/inspector/network/network-worker-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/network-worker-expected.txt 2011-08-10 18:45:25 UTC (rev 92781)
@@ -0,0 +1,10 @@
+CONSOLE MESSAGE: line 14: Done.
+Tests that worker content is available in network panel.
+
+Bug 65929
+http://127.0.0.1:8000/inspector/network/resources/worker.js
+resource.type: 4
+resource.content before requesting content: undefined
+resource.content after requesting content: postMessage("Done.");
+
+
Property changes on: trunk/LayoutTests/http/tests/inspector/network/network-worker-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/http/tests/inspector/network/network-worker.html (0 => 92781)
--- trunk/LayoutTests/http/tests/inspector/network/network-worker.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/network-worker.html 2011-08-10 18:45:25 UTC (rev 92781)
@@ -0,0 +1,52 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+function loadData()
+{
+ var worker = new Worker("resources/worker.js");
+ worker._onmessage_ = workerLoaded;
+}
+
+function workerLoaded(event)
+{
+ console.log(event.data);
+}
+
+function test()
+{
+ // Since this test could be run together with other inspector backend cache
+ // tests, we need to reset size limits to default ones.
+ InspectorTest.resetInspectorResourcesData(step1);
+
+ function step1()
+ {
+ InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
+ InspectorTest.evaluateInPage("loadData()");
+ }
+
+ function step2()
+ {
+ var resource1 = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
+ InspectorTest.addResult(resource1.url);
+ InspectorTest.addResult("resource.type: " + resource1.type);
+ InspectorTest.addResult("resource.content before requesting content: " + resource1.content);
+ resource1.requestContent(step3);
+ }
+
+ function step3()
+ {
+ var resource1 = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
+ InspectorTest.addResult("resource.content after requesting content: " + resource1.content);
+
+ InspectorTest.completeTest();
+ }
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests that worker content is available in network panel.</p>
+<a href="" 65929</a>
+</body>
+</html>
Property changes on: trunk/LayoutTests/http/tests/inspector/network/network-worker.html
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/http/tests/inspector/network/resources/shared-worker.js (0 => 92781)
--- trunk/LayoutTests/http/tests/inspector/network/resources/shared-worker.js (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/resources/shared-worker.js 2011-08-10 18:45:25 UTC (rev 92781)
@@ -0,0 +1,6 @@
+_onconnect_ = function(event)
+{
+ var port = event.ports[0];
+ port.postMessage("Done.");
+}
+
Property changes on: trunk/LayoutTests/http/tests/inspector/network/resources/shared-worker.js
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/http/tests/inspector/network/resources/worker.js (0 => 92781)
--- trunk/LayoutTests/http/tests/inspector/network/resources/worker.js (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/resources/worker.js 2011-08-10 18:45:25 UTC (rev 92781)
@@ -0,0 +1 @@
+postMessage("Done.");
Property changes on: trunk/LayoutTests/http/tests/inspector/network/resources/worker.js
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (92780 => 92781)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-08-10 18:45:25 UTC (rev 92781)
@@ -110,6 +110,8 @@
WONTFIX SKIP : http/tests/websocket/tests/hixie76/workers/ = PASS TIMEOUT FAIL
WONTFIX SKIP : http/tests/websocket/tests/hybi/workers/ = PASS TIMEOUT FAIL
WONTFIX SKIP : inspector/debugger/script-formatter.html = PASS TIMEOUT FAIL
+WONTFIX SKIP : http/tests/inspector/network/network-shared-worker.html = PASS TIMEOUT FAIL
+WONTFIX SKIP : http/tests/inspector/network/network-worker.html = PASS TIMEOUT FAIL
// Page Cache - based tests. Chromium disables page cache because the WebKit page cache keeps previously
// loaded pages alive in memory to be able to quickly substitute them when user clicks History buttons.
Modified: trunk/Source/WebCore/ChangeLog (92780 => 92781)
--- trunk/Source/WebCore/ChangeLog 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/ChangeLog 2011-08-10 18:45:25 UTC (rev 92781)
@@ -1,5 +1,37 @@
2011-08-10 Vsevolod Vlasov <[email protected]>
+ Web Inspector: Remove Network.initialContentSet from protocol, store workers content on backend.
+ https://bugs.webkit.org/show_bug.cgi?id=65929
+
+ Reviewed by Pavel Feldman.
+
+ Tests: http/tests/inspector/network/network-shared-worker.html
+ http/tests/inspector/network/network-worker.html
+
+ * inspector/Inspector.json:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didReceiveScriptResponseImpl):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didReceiveScriptResponse):
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::didReceiveResponse):
+ (WebCore::InspectorResourceAgent::setInitialScriptContent):
+ (WebCore::InspectorResourceAgent::didReceiveScriptResponse):
+ * inspector/InspectorResourceAgent.h:
+ * inspector/front-end/NetworkManager.js:
+ * inspector/front-end/Resource.js:
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::SharedWorkerScriptLoader::didReceiveResponse):
+ * workers/Worker.cpp:
+ (WebCore::Worker::didReceiveResponse):
+ * workers/Worker.h:
+ * workers/WorkerScriptLoader.cpp:
+ (WebCore::WorkerScriptLoader::didReceiveResponse):
+ * workers/WorkerScriptLoaderClient.h:
+ (WebCore::WorkerScriptLoaderClient::didReceiveResponse):
+
+2011-08-10 Vsevolod Vlasov <[email protected]>
+
Web Inspector: [Network] Filtering by stylesheet does not update the # reqs, filesizes.
https://bugs.webkit.org/show_bug.cgi?id=65515
Modified: trunk/Source/WebCore/inspector/Inspector.json (92780 => 92781)
--- trunk/Source/WebCore/inspector/Inspector.json 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/inspector/Inspector.json 2011-08-10 18:45:25 UTC (rev 92781)
@@ -621,15 +621,6 @@
]
},
{
- "name": "initialContentSet",
- "description": "Fired for worker scripts when their content becomes available.",
- "parameters": [
- { "name": "identifier", "type": "string", "description": "Request identifier." },
- { "name": "content", "type": "string", "description": "Resource content." },
- { "name": "type", "$ref": "Page.ResourceType", "description": "Resource type." }
- ]
- },
- {
"name": "webSocketWillSendHandshakeRequest",
"description": "Fired when WebSocket is about to initiate handshake.",
"parameters": [
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (92780 => 92781)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-08-10 18:45:25 UTC (rev 92781)
@@ -557,6 +557,12 @@
resourceAgent->setInitialScriptContent(identifier, sourceString);
}
+void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier)
+{
+ if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
+ resourceAgent->didReceiveScriptResponse(identifier);
+}
+
void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, const KURL& url)
{
DocumentLoader* documentLoader = frame->loader()->documentLoader();
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (92780 => 92781)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-08-10 18:45:25 UTC (rev 92781)
@@ -134,6 +134,7 @@
static void willLoadXHRSynchronously(ScriptExecutionContext*);
static void didLoadXHRSynchronously(ScriptExecutionContext*);
static void scriptImported(ScriptExecutionContext*, unsigned long identifier, const String& sourceString);
+ static void didReceiveScriptResponse(ScriptExecutionContext*, unsigned long identifier);
static void domContentLoadedEventFired(Frame*, const KURL&);
static void loadEventFired(Frame*, const KURL&);
static void frameDetachedFromParent(Frame*);
@@ -262,6 +263,7 @@
static void willLoadXHRSynchronouslyImpl(InstrumentingAgents*);
static void didLoadXHRSynchronouslyImpl(InstrumentingAgents*);
static void scriptImportedImpl(InstrumentingAgents*, unsigned long identifier, const String& sourceString);
+ static void didReceiveScriptResponseImpl(InstrumentingAgents*, unsigned long identifier);
static void domContentLoadedEventFiredImpl(InstrumentingAgents*, Frame*, const KURL&);
static void loadEventFiredImpl(InstrumentingAgents*, Frame*, const KURL&);
static void frameDetachedFromParentImpl(InstrumentingAgents*, Frame*);
@@ -836,6 +838,14 @@
#endif
}
+inline void InspectorInstrumentation::didReceiveScriptResponse(ScriptExecutionContext* context, unsigned long identifier)
+{
+#if ENABLE(INSPECTOR)
+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
+ didReceiveScriptResponseImpl(instrumentingAgents, identifier);
+#endif
+}
+
inline void InspectorInstrumentation::domContentLoadedEventFired(Frame* frame, const KURL& url)
{
#if ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (92780 => 92781)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-08-10 18:45:25 UTC (rev 92781)
@@ -265,6 +265,8 @@
type = InspectorPageAgent::DocumentResource;
else if (m_loadingXHRSynchronously || m_resourcesData->resourceType(resourceId) == InspectorPageAgent::XHRResource)
type = InspectorPageAgent::XHRResource;
+ else if (m_resourcesData->resourceType(resourceId) == InspectorPageAgent::ScriptResource)
+ type = InspectorPageAgent::ScriptResource;
m_resourcesData->responseReceived(resourceId, m_pageAgent->frameId(loader->frame()), response);
}
@@ -323,9 +325,14 @@
void InspectorResourceAgent::setInitialScriptContent(unsigned long identifier, const String& sourceString)
{
- m_frontend->initialContentSet(IdentifiersFactory::resourceId(identifier), sourceString, InspectorPageAgent::resourceTypeString(InspectorPageAgent::ScriptResource));
+ m_resourcesData->setResourceContent(IdentifiersFactory::resourceId(identifier), sourceString);
}
+void InspectorResourceAgent::didReceiveScriptResponse(unsigned long identifier)
+{
+ m_resourcesData->setResourceType(IdentifiersFactory::resourceId(identifier), InspectorPageAgent::ScriptResource);
+}
+
void InspectorResourceAgent::setInitialXHRContent(unsigned long identifier, const String& sourceString)
{
m_resourcesData->setResourceContent(IdentifiersFactory::resourceId(identifier), sourceString);
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (92780 => 92781)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2011-08-10 18:45:25 UTC (rev 92781)
@@ -97,6 +97,7 @@
void didLoadResourceFromMemoryCache(DocumentLoader*, CachedResource*);
void mainFrameNavigated(DocumentLoader*);
void setInitialScriptContent(unsigned long identifier, const String& sourceString);
+ void didReceiveScriptResponse(unsigned long identifier);
void setInitialXHRContent(unsigned long identifier, const String& sourceString);
void didReceiveXHRResponse(unsigned long identifier);
void willLoadXHRSynchronously();
Modified: trunk/Source/WebCore/inspector/front-end/NetworkManager.js (92780 => 92781)
--- trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-08-10 18:45:25 UTC (rev 92781)
@@ -223,17 +223,6 @@
this._finishResource(resource, time);
},
- initialContentSet: function(identifier, sourceString, type)
- {
- var resource = WebInspector.networkResourceById(identifier);
- if (!resource)
- return;
-
- resource.type = WebInspector.Resource.Type[type];
- resource.setInitialContent(sourceString);
- this._updateResource(resource);
- },
-
webSocketCreated: function(identifier, requestURL)
{
var resource = this._createResource(identifier, null, null, requestURL);
Modified: trunk/Source/WebCore/inspector/front-end/Resource.js (92780 => 92781)
--- trunk/Source/WebCore/inspector/front-end/Resource.js 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/inspector/front-end/Resource.js 2011-08-10 18:45:25 UTC (rev 92781)
@@ -802,11 +802,6 @@
return this._contentTimestamp;
},
- setInitialContent: function(content)
- {
- this._content = content;
- },
-
isEditable: function()
{
if (this._actualResource)
Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (92780 => 92781)
--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2011-08-10 18:45:25 UTC (rev 92781)
@@ -265,7 +265,8 @@
void load(const KURL&);
private:
- // WorkerScriptLoaderClient callback
+ // WorkerScriptLoaderClient callbacks
+ virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
virtual void notifyFinished();
RefPtr<SharedWorker> m_worker;
@@ -295,6 +296,11 @@
m_scriptLoader->loadAsynchronously(m_worker->scriptExecutionContext(), url, DenyCrossOriginRequests, this);
}
+void SharedWorkerScriptLoader::didReceiveResponse(unsigned long identifier, const ResourceResponse&)
+{
+ InspectorInstrumentation::didReceiveScriptResponse(m_worker->scriptExecutionContext(), identifier);
+}
+
void SharedWorkerScriptLoader::notifyFinished()
{
// FIXME: This method is not guaranteed to be invoked if we are loading from WorkerContext (see comment for WorkerScriptLoaderClient::notifyFinished()).
Modified: trunk/Source/WebCore/workers/Worker.cpp (92780 => 92781)
--- trunk/Source/WebCore/workers/Worker.cpp 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/workers/Worker.cpp 2011-08-10 18:45:25 UTC (rev 92781)
@@ -129,6 +129,11 @@
return m_contextProxy->hasPendingActivity() || ActiveDOMObject::hasPendingActivity();
}
+void Worker::didReceiveResponse(unsigned long identifier, const ResourceResponse&)
+{
+ InspectorInstrumentation::didReceiveScriptResponse(scriptExecutionContext(), identifier);
+}
+
void Worker::notifyFinished()
{
if (m_scriptLoader->failed())
Modified: trunk/Source/WebCore/workers/Worker.h (92780 => 92781)
--- trunk/Source/WebCore/workers/Worker.h 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/workers/Worker.h 2011-08-10 18:45:25 UTC (rev 92781)
@@ -72,6 +72,8 @@
private:
Worker(ScriptExecutionContext*);
+ // WorkerScriptLoaderClient callbacks
+ virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
virtual void notifyFinished();
virtual void refEventTarget() { ref(); }
Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (92780 => 92781)
--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2011-08-10 18:45:25 UTC (rev 92781)
@@ -115,7 +115,7 @@
return request.release();
}
-void WorkerScriptLoader::didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse& response)
+void WorkerScriptLoader::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
{
if (response.httpStatusCode() / 100 != 2 && response.httpStatusCode()) {
m_failed = true;
@@ -124,7 +124,7 @@
m_responseURL = response.url();
m_responseEncoding = response.textEncodingName();
if (m_client)
- m_client->didReceiveResponse(response);
+ m_client->didReceiveResponse(identifier, response);
}
void WorkerScriptLoader::didReceiveData(const char* data, int len)
Modified: trunk/Source/WebCore/workers/WorkerScriptLoaderClient.h (92780 => 92781)
--- trunk/Source/WebCore/workers/WorkerScriptLoaderClient.h 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebCore/workers/WorkerScriptLoaderClient.h 2011-08-10 18:45:25 UTC (rev 92781)
@@ -36,7 +36,7 @@
class WorkerScriptLoaderClient {
public:
- virtual void didReceiveResponse(const ResourceResponse&) { }
+ virtual void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&) { }
// FIXME: notifyFinished() is not currently guaranteed to be invoked if used from worker context and the worker shuts down in the middle of an operation.
// This will cause leaks when we support nested workers.
Modified: trunk/Source/WebKit/chromium/ChangeLog (92780 => 92781)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-08-10 18:45:25 UTC (rev 92781)
@@ -1,3 +1,13 @@
+2011-08-10 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Remove Network.initialContentSet from protocol, store workers content on backend.
+ https://bugs.webkit.org/show_bug.cgi?id=65929
+
+ Reviewed by Pavel Feldman.
+
+ * src/SharedWorkerRepository.cpp:
+ (WebCore::SharedWorkerScriptLoader::didReceiveResponse):
+
2011-08-10 Andrey Kosyakov <[email protected]>
Unreviewed. Rolled DEPS 95813:96009 to pick data url timing fix.
Modified: trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp (92780 => 92781)
--- trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp 2011-08-10 18:41:03 UTC (rev 92780)
+++ trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp 2011-08-10 18:45:25 UTC (rev 92781)
@@ -82,8 +82,8 @@
static void stopAllLoadersForContext(ScriptExecutionContext*);
private:
- // WorkerScriptLoaderClient callback
- virtual void didReceiveResponse(const ResourceResponse&);
+ // WorkerScriptLoaderClient callbacks
+ virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
virtual void notifyFinished();
virtual void connected();
@@ -153,9 +153,10 @@
return webPort;
}
-void SharedWorkerScriptLoader::didReceiveResponse(const ResourceResponse& response)
+void SharedWorkerScriptLoader::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
{
m_responseAppCacheID = response.appCacheID();
+ InspectorInstrumentation::didReceiveScriptResponse(m_worker->scriptExecutionContext(), identifier);
}
void SharedWorkerScriptLoader::notifyFinished()
