Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1684)

Unified Diff: Source/web/WebSharedWorkerImpl.cpp

Issue 463433002: Oilpan: fix build after r179934. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebSharedWorkerImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebSharedWorkerImpl.cpp
diff --git a/Source/web/WebSharedWorkerImpl.cpp b/Source/web/WebSharedWorkerImpl.cpp
index 28a63eb0d40e75ce045289d86553fce7f5978753..26bf424af4d35d9f31903a5aadbac66b2d246068 100644
--- a/Source/web/WebSharedWorkerImpl.cpp
+++ b/Source/web/WebSharedWorkerImpl.cpp
@@ -94,7 +94,7 @@ public:
ASSERT(loadingContext);
m_receiveResponseCallback = receiveResponseCallback;
m_finishCallback = finishCallback;
- m_scriptLoader->setRequestContext(blink::WebURLRequest::RequestContextSharedWorker);
+ m_scriptLoader->setRequestContext(WebURLRequest::RequestContextSharedWorker);
m_scriptLoader->loadAsynchronously(
*loadingContext, scriptURL, DenyCrossOriginRequests, this);
}
@@ -240,7 +240,7 @@ void WebSharedWorkerImpl::reportException(const String& errorMessage, int lineNu
// Not suppported in SharedWorker.
}
-void WebSharedWorkerImpl::reportConsoleMessage(PassRefPtr<blink::ConsoleMessage>)
+void WebSharedWorkerImpl::reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>)
{
// Not supported in SharedWorker.
}
@@ -366,7 +366,7 @@ void WebSharedWorkerImpl::onScriptLoaderFinished()
provideDatabaseClientToWorker(workerClients.get(), DatabaseClientImpl::create());
WebSecurityOrigin webSecurityOrigin(m_loadingDocument->securityOrigin());
providePermissionClientToWorker(workerClients.get(), adoptPtr(client()->createWorkerPermissionClientProxy(webSecurityOrigin)));
- OwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(m_url, m_loadingDocument->userAgent(m_url), m_mainScriptLoader->script(), startMode, m_contentSecurityPolicy, static_cast<blink::ContentSecurityPolicyHeaderType>(m_policyType), workerClients.release());
+ OwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(m_url, m_loadingDocument->userAgent(m_url), m_mainScriptLoader->script(), startMode, m_contentSecurityPolicy, static_cast<ContentSecurityPolicyHeaderType>(m_policyType), workerClients.release());
setWorkerThread(SharedWorkerThread::create(m_name, *this, *this, startupData.release()));
InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScriptLoader->identifier(), m_mainScriptLoader->script());
m_mainScriptLoader.clear();
« no previous file with comments | « Source/web/WebSharedWorkerImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698