Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp |
index 28be4578552238cd2537e7851ae6340faa60a3f0..e2df066d290d410652b85a96a77c77078e7c2880 100644 |
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp |
@@ -224,7 +224,7 @@ void WebSharedWorkerImpl::reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMes |
void WebSharedWorkerImpl::postMessageToPageInspector(const String& message) |
{ |
- m_mainFrame->frame()->document()->postInspectorTask(FROM_HERE, createCrossThreadTask(&WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread, this, message)); |
+ m_mainFrame->frame()->document()->postInspectorTask(BLINK_FROM_HERE, createCrossThreadTask(&WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread, this, message)); |
} |
void WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread(const String& message) |
@@ -238,7 +238,7 @@ void WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread(const String& m |
void WebSharedWorkerImpl::workerGlobalScopeClosed() |
{ |
- Platform::current()->mainThread()->taskRunner()->postTask(FROM_HERE, threadSafeBind(&WebSharedWorkerImpl::workerGlobalScopeClosedOnMainThread, AllowCrossThreadAccess(this))); |
+ Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&WebSharedWorkerImpl::workerGlobalScopeClosedOnMainThread, AllowCrossThreadAccess(this))); |
} |
void WebSharedWorkerImpl::workerGlobalScopeClosedOnMainThread() |
@@ -254,7 +254,7 @@ void WebSharedWorkerImpl::workerGlobalScopeStarted(WorkerGlobalScope*) |
void WebSharedWorkerImpl::workerThreadTerminated() |
{ |
- Platform::current()->mainThread()->taskRunner()->postTask(FROM_HERE, threadSafeBind(&WebSharedWorkerImpl::workerThreadTerminatedOnMainThread, AllowCrossThreadAccess(this))); |
+ Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&WebSharedWorkerImpl::workerThreadTerminatedOnMainThread, AllowCrossThreadAccess(this))); |
} |
void WebSharedWorkerImpl::workerThreadTerminatedOnMainThread() |
@@ -268,19 +268,19 @@ void WebSharedWorkerImpl::workerThreadTerminatedOnMainThread() |
void WebSharedWorkerImpl::postTaskToLoader(PassOwnPtr<ExecutionContextTask> task) |
{ |
- m_mainFrame->frame()->document()->postTask(FROM_HERE, task); |
+ m_mainFrame->frame()->document()->postTask(BLINK_FROM_HERE, task); |
} |
bool WebSharedWorkerImpl::postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask> task) |
{ |
- m_workerThread->postTask(FROM_HERE, task); |
+ m_workerThread->postTask(BLINK_FROM_HERE, task); |
return true; |
} |
void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel) |
{ |
workerThread()->postTask( |
- FROM_HERE, createCrossThreadTask(&connectTask, adoptPtr(webChannel))); |
+ BLINK_FROM_HERE, createCrossThreadTask(&connectTask, adoptPtr(webChannel))); |
} |
void WebSharedWorkerImpl::connectTask(PassOwnPtr<WebMessagePortChannel> channel, ExecutionContext* context) |