| Index: third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| diff --git a/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| index 685579940df6d22c1c15ba372fa4ea6bacb9e820..33a81b3de1f5f0440ef2fb50ac529e093b5ad85c 100644
|
| --- a/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| +++ b/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| @@ -40,24 +40,24 @@
|
|
|
| namespace blink {
|
|
|
| -PassRefPtrWillBeRawPtr<MessageEvent> createConnectEvent(MessagePort* port)
|
| +RawPtr<MessageEvent> createConnectEvent(MessagePort* port)
|
| {
|
| - RefPtrWillBeRawPtr<MessageEvent> event = MessageEvent::create(new MessagePortArray(1, port), String(), String(), port);
|
| + RawPtr<MessageEvent> event = MessageEvent::create(new MessagePortArray(1, port), String(), String(), port);
|
| event->initEvent(EventTypeNames::connect, false, false);
|
| return event.release();
|
| }
|
|
|
| // static
|
| -PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| +RawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| {
|
| // Note: startupData is finalized on return. After the relevant parts has been
|
| // passed along to the created 'context'.
|
| - RefPtrWillBeRawPtr<SharedWorkerGlobalScope> context = adoptRefWillBeNoop(new SharedWorkerGlobalScope(name, startupData->m_scriptURL, startupData->m_userAgent, thread, startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release()));
|
| + RawPtr<SharedWorkerGlobalScope> context = (new SharedWorkerGlobalScope(name, startupData->m_scriptURL, startupData->m_userAgent, thread, startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release()));
|
| context->applyContentSecurityPolicyFromVector(*startupData->m_contentSecurityPolicyHeaders);
|
| return context.release();
|
| }
|
|
|
| -SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
|
| +SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, RawPtr<WorkerClients> workerClients)
|
| : WorkerGlobalScope(url, userAgent, thread, monotonicallyIncreasingTime(), starterOriginPrivilegeData, workerClients)
|
| , m_name(name)
|
| {
|
| @@ -80,7 +80,7 @@ SharedWorkerThread* SharedWorkerGlobalScope::thread()
|
| void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> callStack)
|
| {
|
| WorkerGlobalScope::logExceptionToConsole(errorMessage, scriptId, sourceURL, lineNumber, columnNumber, callStack);
|
| - RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, columnNumber);
|
| + RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, columnNumber);
|
| consoleMessage->setScriptId(scriptId);
|
| consoleMessage->setCallStack(callStack);
|
| addMessageToWorkerConsole(consoleMessage.release());
|
|
|