<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169673] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169673">169673</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-06-07 06:06:47 -0700 (Sat, 07 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace uses of CrossThreadTask in DefaultSharedWorkerRepository, WorkerMessagingProxy with C++11 lambdas
https://bugs.webkit.org/show_bug.cgi?id=133375
Reviewed by Darin Adler.
Uses of CrossThreadTask in the two classes are replaced with C++11 lambdas.
The necessary cross-thread copies are created manually and passed into the
lambdas by value, removing the need for CrossThreadTask and its use of CrossThreadCopier.
Remove the explicit use of this pointer in some lambdas -- it is captured automatically when
capturing by value, so enforcing its capturing through explicit use is not necessary.
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::SharedWorkerProxy::postExceptionToWorkerObject):
(WebCore::SharedWorkerProxy::postConsoleMessageToWorkerObject):
(WebCore::postExceptionTask): Deleted.
(WebCore::postConsoleMessageTask): Deleted.
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::postMessageToWorkerObject):
(WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject):
(WebCore::WorkerMessagingProxy::workerObjectDestroyed):
(WebCore::WorkerMessagingProxy::notifyNetworkStateChange):
(WebCore::WorkerMessagingProxy::connectToInspector):
(WebCore::WorkerMessagingProxy::disconnectFromInspector):
(WebCore::WorkerMessagingProxy::sendMessageToInspector):
(WebCore::WorkerMessagingProxy::postMessageToPageInspector):
(WebCore::WorkerMessagingProxy::confirmMessageFromWorkerObject):
(WebCore::WorkerMessagingProxy::reportPendingActivity):
(WebCore::postConsoleMessageTask): Deleted.
(WebCore::WorkerMessagingProxy::workerObjectDestroyedInternal): Deleted.
(WebCore::connectToWorkerGlobalScopeInspectorTask): Deleted.
(WebCore::disconnectFromWorkerGlobalScopeInspectorTask): Deleted.
(WebCore::dispatchOnInspectorBackendTask): Deleted.
* workers/WorkerMessagingProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxyh">trunk/Source/WebCore/workers/WorkerMessagingProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169672 => 169673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-07 09:21:21 UTC (rev 169672)
+++ trunk/Source/WebCore/ChangeLog 2014-06-07 13:06:47 UTC (rev 169673)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-06-07 Zan Dobersek <zdobersek@igalia.com>
+
+ Replace uses of CrossThreadTask in DefaultSharedWorkerRepository, WorkerMessagingProxy with C++11 lambdas
+ https://bugs.webkit.org/show_bug.cgi?id=133375
+
+ Reviewed by Darin Adler.
+
+ Uses of CrossThreadTask in the two classes are replaced with C++11 lambdas.
+ The necessary cross-thread copies are created manually and passed into the
+ lambdas by value, removing the need for CrossThreadTask and its use of CrossThreadCopier.
+
+ Remove the explicit use of this pointer in some lambdas -- it is captured automatically when
+ capturing by value, so enforcing its capturing through explicit use is not necessary.
+
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::SharedWorkerProxy::postExceptionToWorkerObject):
+ (WebCore::SharedWorkerProxy::postConsoleMessageToWorkerObject):
+ (WebCore::postExceptionTask): Deleted.
+ (WebCore::postConsoleMessageTask): Deleted.
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::postMessageToWorkerObject):
+ (WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject):
+ (WebCore::WorkerMessagingProxy::workerObjectDestroyed):
+ (WebCore::WorkerMessagingProxy::notifyNetworkStateChange):
+ (WebCore::WorkerMessagingProxy::connectToInspector):
+ (WebCore::WorkerMessagingProxy::disconnectFromInspector):
+ (WebCore::WorkerMessagingProxy::sendMessageToInspector):
+ (WebCore::WorkerMessagingProxy::postMessageToPageInspector):
+ (WebCore::WorkerMessagingProxy::confirmMessageFromWorkerObject):
+ (WebCore::WorkerMessagingProxy::reportPendingActivity):
+ (WebCore::postConsoleMessageTask): Deleted.
+ (WebCore::WorkerMessagingProxy::workerObjectDestroyedInternal): Deleted.
+ (WebCore::connectToWorkerGlobalScopeInspectorTask): Deleted.
+ (WebCore::disconnectFromWorkerGlobalScopeInspectorTask): Deleted.
+ (WebCore::dispatchOnInspectorBackendTask): Deleted.
+ * workers/WorkerMessagingProxy.h:
+
</ins><span class="cx"> 2014-06-06 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Scheme of content utils should be compared in an ASCII case-insensitive manner
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (169672 => 169673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-06-07 09:21:21 UTC (rev 169672)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-06-07 13:06:47 UTC (rev 169673)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "DefaultSharedWorkerRepository.h"
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><del>-#include "CrossThreadTask.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -179,28 +178,28 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void postExceptionTask(ScriptExecutionContext* context, const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
-{
- context->reportException(errorMessage, lineNumber, columnNumber, sourceURL, 0);
-}
-
</del><span class="cx"> void SharedWorkerProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_workerDocumentsLock);
</span><ins>+ String errorMessageCopy = errorMessage.isolatedCopy();
+ String sourceURLCopy = sourceURL.isolatedCopy();
+
</ins><span class="cx"> for (auto& document : m_workerDocuments)
</span><del>- document->postTask(CrossThreadTask(&postExceptionTask, errorMessage, lineNumber, columnNumber, sourceURL));
</del><ins>+ document->postTask([=] (ScriptExecutionContext* context) {
+ context->reportException(errorMessageCopy, lineNumber, columnNumber, sourceURLCopy, nullptr);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void postConsoleMessageTask(ScriptExecutionContext* document, MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber)
-{
- document->addConsoleMessage(source, level, message, sourceURL, lineNumber, columnNumber);
-}
-
</del><span class="cx"> void SharedWorkerProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_workerDocumentsLock);
</span><ins>+ String messageCopy = message.isolatedCopy();
+ String sourceURLCopy = sourceURL.isolatedCopy();
+
</ins><span class="cx"> for (auto& document : m_workerDocuments)
</span><del>- document->postTask(CrossThreadTask(&postConsoleMessageTask, source, level, message, sourceURL, lineNumber, columnNumber));
</del><ins>+ document->postTask([=] (ScriptExecutionContext* context) {
+ context->addConsoleMessage(source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (169672 => 169673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-06-07 09:21:21 UTC (rev 169672)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-06-07 13:06:47 UTC (rev 169673)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "WorkerMessagingProxy.h"
</span><span class="cx">
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><del>-#include "CrossThreadTask.h"
</del><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "DedicatedWorkerGlobalScope.h"
</span><span class="cx"> #include "DedicatedWorkerThread.h"
</span><span class="lines">@@ -99,7 +98,7 @@
</span><span class="cx"> MessagePortChannelArray* channelsPtr = channels.release();
</span><span class="cx"> m_scriptExecutionContext->postTask([=] (ScriptExecutionContext* context) {
</span><span class="cx"> Worker* workerObject = this->workerObject();
</span><del>- if (!workerObject || this->askedToTerminate())
</del><ins>+ if (!workerObject || askedToTerminate())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(*context, std::unique_ptr<MessagePortChannelArray>(channelsPtr));
</span><span class="lines">@@ -163,16 +162,15 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void postConsoleMessageTask(ScriptExecutionContext* context, WorkerMessagingProxy* messagingProxy, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
-{
- if (messagingProxy->askedToTerminate())
- return;
- context->addConsoleMessage(source, level, message, sourceURL, lineNumber, columnNumber);
-}
-
</del><span class="cx"> void WorkerMessagingProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask(CrossThreadTask(&postConsoleMessageTask, AllowCrossThreadAccess(this), source, level, message, lineNumber, columnNumber, sourceURL));
</del><ins>+ String messageCopy = message.isolatedCopy();
+ String sourceURLCopy = sourceURL.isolatedCopy();
+ m_scriptExecutionContext->postTask([=] (ScriptExecutionContext* context) {
+ if (askedToTerminate())
+ return;
+ context->addConsoleMessage(source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerThreadCreated(PassRefPtr<DedicatedWorkerThread> workerThread)
</span><span class="lines">@@ -196,7 +194,13 @@
</span><span class="cx"> void WorkerMessagingProxy::workerObjectDestroyed()
</span><span class="cx"> {
</span><span class="cx"> m_workerObject = 0;
</span><del>- m_scriptExecutionContext->postTask(CrossThreadTask(&workerObjectDestroyedInternal, AllowCrossThreadAccess(this)));
</del><ins>+ m_scriptExecutionContext->postTask([this] (ScriptExecutionContext*) {
+ m_mayBeDestroyed = true;
+ if (m_workerThread)
+ terminateWorkerGlobalScope();
+ else
+ workerGlobalScopeDestroyedInternal();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::notifyNetworkStateChange(bool isOnline)
</span><span class="lines">@@ -208,58 +212,40 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_workerThread->runLoop().postTask([=] (ScriptExecutionContext* context) {
</span><del>- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
- workerGlobalScope->dispatchEvent(Event::create(isOnline ? eventNames().onlineEvent : eventNames().offlineEvent, false, false));
</del><ins>+ toWorkerGlobalScope(context)->dispatchEvent(Event::create(isOnline ? eventNames().onlineEvent : eventNames().offlineEvent, false, false));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerMessagingProxy::workerObjectDestroyedInternal(ScriptExecutionContext*, WorkerMessagingProxy* proxy)
-{
- proxy->m_mayBeDestroyed = true;
- if (proxy->m_workerThread)
- proxy->terminateWorkerGlobalScope();
- else
- proxy->workerGlobalScopeDestroyedInternal();
-}
-
</del><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-static void connectToWorkerGlobalScopeInspectorTask(ScriptExecutionContext* context, bool)
-{
- toWorkerGlobalScope(context)->workerInspectorController().connectFrontend();
-}
-
</del><span class="cx"> void WorkerMessagingProxy::connectToInspector(WorkerGlobalScopeProxy::PageInspector* pageInspector)
</span><span class="cx"> {
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(!m_pageInspector);
</span><span class="cx"> m_pageInspector = pageInspector;
</span><del>- m_workerThread->runLoop().postTaskForMode(CrossThreadTask(connectToWorkerGlobalScopeInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
</del><ins>+ m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext* context) {
+ toWorkerGlobalScope(context)->workerInspectorController().connectFrontend();
+ }, WorkerDebuggerAgent::debuggerTaskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void disconnectFromWorkerGlobalScopeInspectorTask(ScriptExecutionContext* context, bool)
-{
- toWorkerGlobalScope(context)->workerInspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
-}
-
</del><span class="cx"> void WorkerMessagingProxy::disconnectFromInspector()
</span><span class="cx"> {
</span><span class="cx"> m_pageInspector = 0;
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><del>- m_workerThread->runLoop().postTaskForMode(CrossThreadTask(disconnectFromWorkerGlobalScopeInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
</del><ins>+ m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext* context) {
+ toWorkerGlobalScope(context)->workerInspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
+ }, WorkerDebuggerAgent::debuggerTaskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void dispatchOnInspectorBackendTask(ScriptExecutionContext* context, const String& message)
-{
- toWorkerGlobalScope(context)->workerInspectorController().dispatchMessageFromFrontend(message);
-}
-
</del><span class="cx"> void WorkerMessagingProxy::sendMessageToInspector(const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><del>- m_workerThread->runLoop().postTaskForMode(CrossThreadTask(dispatchOnInspectorBackendTask, String(message)), WorkerDebuggerAgent::debuggerTaskMode);
</del><ins>+ String messageCopy = message.isolatedCopy();
+ m_workerThread->runLoop().postTaskForMode([messageCopy] (ScriptExecutionContext* context) {
+ toWorkerGlobalScope(context)->workerInspectorController().dispatchMessageFromFrontend(messageCopy);
+ }, WorkerDebuggerAgent::debuggerTaskMode);
</ins><span class="cx"> WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(m_workerThread.get());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -310,7 +296,7 @@
</span><span class="cx"> {
</span><span class="cx"> String messageCopy = message.isolatedCopy();
</span><span class="cx"> m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
</span><del>- this->m_pageInspector->dispatchMessageFromWorker(messageCopy);
</del><ins>+ m_pageInspector->dispatchMessageFromWorker(messageCopy);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -318,7 +304,7 @@
</span><span class="cx"> void WorkerMessagingProxy::confirmMessageFromWorkerObject(bool hasPendingActivity)
</span><span class="cx"> {
</span><span class="cx"> m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
</span><del>- this->reportPendingActivityInternal(true, hasPendingActivity);
</del><ins>+ reportPendingActivityInternal(true, hasPendingActivity);
</ins><span class="cx"> });
</span><span class="cx"> // Will execute reportPendingActivityInternal() on context's thread.
</span><span class="cx"> }
</span><span class="lines">@@ -326,7 +312,7 @@
</span><span class="cx"> void WorkerMessagingProxy::reportPendingActivity(bool hasPendingActivity)
</span><span class="cx"> {
</span><span class="cx"> m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
</span><del>- this->reportPendingActivityInternal(false, hasPendingActivity);
</del><ins>+ reportPendingActivityInternal(false, hasPendingActivity);
</ins><span class="cx"> });
</span><span class="cx"> // Will execute reportPendingActivityInternal() on context's thread.
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.h (169672 => 169673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2014-06-07 09:21:21 UTC (rev 169672)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2014-06-07 13:06:47 UTC (rev 169673)
</span><span class="lines">@@ -98,7 +98,6 @@
</span><span class="cx"> friend class WorkerThreadActivityReportTask;
</span><span class="cx">
</span><span class="cx"> void workerGlobalScopeDestroyedInternal();
</span><del>- static void workerObjectDestroyedInternal(ScriptExecutionContext*, WorkerMessagingProxy*);
</del><span class="cx"> void reportPendingActivityInternal(bool confirmingMessage, bool hasPendingActivity);
</span><span class="cx"> Worker* workerObject() const { return m_workerObject; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>