Title: [108212] trunk/Source
- Revision
- 108212
- Author
- [email protected]
- Date
- 2012-02-19 23:51:27 -0800 (Sun, 19 Feb 2012)
Log Message
[Chromium] Web Inspector: terminated workers are not removed from dedicated worker list
https://bugs.webkit.org/show_bug.cgi?id=78899
Source/WebCore:
Notify inspector about starting context from WorkerContextProxy not from Worker.
Reviewed by Pavel Feldman.
* workers/Worker.cpp:
(WebCore::Worker::notifyFinished):
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::startWorkerContext):
Source/WebKit/chromium:
Pass original WorkerContextProxy object to the inspector instrumentation instead
of Chromium-specific one for consistency with WorkerMessagingProxy implementation
in WebCore.
Reviewed by Pavel Feldman.
* src/WebWorkerClientImpl.cpp:
(WebKit::WebWorkerClientImpl::startWorkerContext):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108211 => 108212)
--- trunk/Source/WebCore/ChangeLog 2012-02-20 07:41:56 UTC (rev 108211)
+++ trunk/Source/WebCore/ChangeLog 2012-02-20 07:51:27 UTC (rev 108212)
@@ -1,3 +1,17 @@
+2012-02-17 Yury Semikhatsky <[email protected]>
+
+ [Chromium] Web Inspector: terminated workers are not removed from dedicated worker list
+ https://bugs.webkit.org/show_bug.cgi?id=78899
+
+ Notify inspector about starting context from WorkerContextProxy not from Worker.
+
+ Reviewed by Pavel Feldman.
+
+ * workers/Worker.cpp:
+ (WebCore::Worker::notifyFinished):
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::startWorkerContext):
+
2012-02-19 Keishi Hattori <[email protected]>
Use shadowRootList for ColorInputType
Modified: trunk/Source/WebCore/workers/Worker.cpp (108211 => 108212)
--- trunk/Source/WebCore/workers/Worker.cpp 2012-02-20 07:41:56 UTC (rev 108211)
+++ trunk/Source/WebCore/workers/Worker.cpp 2012-02-20 07:51:27 UTC (rev 108212)
@@ -150,7 +150,6 @@
if (InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(scriptExecutionContext()))
startMode = PauseWorkerContextOnStart;
m_contextProxy->startWorkerContext(m_scriptLoader->url(), scriptExecutionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), startMode);
- InspectorInstrumentation::didStartWorkerContext(scriptExecutionContext(), m_contextProxy, m_scriptLoader->url());
InspectorInstrumentation::scriptImported(scriptExecutionContext(), m_scriptLoader->identifier(), m_scriptLoader->script());
}
m_scriptLoader = nullptr;
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (108211 => 108212)
--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2012-02-20 07:41:56 UTC (rev 108211)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2012-02-20 07:51:27 UTC (rev 108212)
@@ -276,6 +276,7 @@
m_scriptExecutionContext->contentSecurityPolicy()->headerType());
workerThreadCreated(thread);
thread->start();
+ InspectorInstrumentation::didStartWorkerContext(m_scriptExecutionContext.get(), this, scriptURL);
}
void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptValue> message, PassOwnPtr<MessagePortChannelArray> channels)
Modified: trunk/Source/WebKit/chromium/ChangeLog (108211 => 108212)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-20 07:41:56 UTC (rev 108211)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-20 07:51:27 UTC (rev 108212)
@@ -1,3 +1,17 @@
+2012-02-17 Yury Semikhatsky <[email protected]>
+
+ [Chromium] Web Inspector: terminated workers are not removed from dedicated worker list
+ https://bugs.webkit.org/show_bug.cgi?id=78899
+
+ Pass original WorkerContextProxy object to the inspector instrumentation instead
+ of Chromium-specific one for consistency with WorkerMessagingProxy implementation
+ in WebCore.
+
+ Reviewed by Pavel Feldman.
+
+ * src/WebWorkerClientImpl.cpp:
+ (WebKit::WebWorkerClientImpl::startWorkerContext):
+
2012-02-18 raman Tenneti <[email protected]>
Track the NPN protocol version negotiated with the server
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (108211 => 108212)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2012-02-20 07:41:56 UTC (rev 108211)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2012-02-20 07:51:27 UTC (rev 108212)
@@ -39,6 +39,7 @@
#include "ErrorEvent.h"
#include "Frame.h"
#include "FrameLoaderClient.h"
+#include "InspectorInstrumentation.h"
#include "MessageEvent.h"
#include "MessagePort.h"
#include "MessagePortChannel.h"
@@ -90,6 +91,7 @@
m_scriptExecutionContext->contentSecurityPolicy()->headerType());
m_proxy->workerThreadCreated(thread);
thread->start();
+ InspectorInstrumentation::didStartWorkerContext(m_scriptExecutionContext.get(), m_proxy, scriptURL);
}
void WebWorkerClientImpl::terminateWorkerContext()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
