| Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| index 8bb957d82572ca6d567f7fd6eec5e2c4883ed0d4..4d033a143480b89a2d191cceecaafb806d1e0936 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| @@ -64,11 +64,11 @@
|
|
|
| namespace blink {
|
|
|
| -PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::create(ServiceWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| +RawPtr<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::create(ServiceWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| {
|
| // Note: startupData is finalized on return. After the relevant parts has been
|
| // passed along to the created 'context'.
|
| - RefPtrWillBeRawPtr<ServiceWorkerGlobalScope> context = adoptRefWillBeNoop(new ServiceWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgent, thread, monotonicallyIncreasingTime(), startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release()));
|
| + RawPtr<ServiceWorkerGlobalScope> context = new ServiceWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgent, thread, monotonicallyIncreasingTime(), startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release());
|
|
|
| context->setV8CacheOptions(startupData->m_v8CacheOptions);
|
| context->applyContentSecurityPolicyFromVector(*startupData->m_contentSecurityPolicyHeaders);
|
| @@ -77,7 +77,7 @@ PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::creat
|
| return context.release();
|
| }
|
|
|
| -ServiceWorkerGlobalScope::ServiceWorkerGlobalScope(const KURL& url, const String& userAgent, ServiceWorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
|
| +ServiceWorkerGlobalScope::ServiceWorkerGlobalScope(const KURL& url, const String& userAgent, ServiceWorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, RawPtr<WorkerClients> workerClients)
|
| : WorkerGlobalScope(url, userAgent, thread, timeOrigin, starterOriginPrivilegeData, workerClients)
|
| , m_didEvaluateScript(false)
|
| , m_hadErrorInTopLevelEventHandler(false)
|
| @@ -148,14 +148,14 @@ void ServiceWorkerGlobalScope::setRegistration(WebPassOwnPtr<WebServiceWorkerReg
|
| m_registration = ServiceWorkerRegistration::getOrCreate(getExecutionContext(), handle.release());
|
| }
|
|
|
| -bool ServiceWorkerGlobalScope::addEventListenerInternal(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener> listener, const EventListenerOptions& options)
|
| +bool ServiceWorkerGlobalScope::addEventListenerInternal(const AtomicString& eventType, RawPtr<EventListener> listener, const EventListenerOptions& options)
|
| {
|
| if (m_didEvaluateScript) {
|
| if (eventType == EventTypeNames::install) {
|
| - RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Event handler of 'install' event must be added on the initial evaluation of worker script.");
|
| + RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Event handler of 'install' event must be added on the initial evaluation of worker script.");
|
| addMessageToWorkerConsole(consoleMessage.release());
|
| } else if (eventType == EventTypeNames::activate) {
|
| - RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Event handler of 'activate' event must be added on the initial evaluation of worker script.");
|
| + RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Event handler of 'activate' event must be added on the initial evaluation of worker script.");
|
| addMessageToWorkerConsole(consoleMessage.release());
|
| }
|
| }
|
| @@ -167,7 +167,7 @@ const AtomicString& ServiceWorkerGlobalScope::interfaceName() const
|
| return EventTargetNames::ServiceWorkerGlobalScope;
|
| }
|
|
|
| -DispatchEventResult ServiceWorkerGlobalScope::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
|
| +DispatchEventResult ServiceWorkerGlobalScope::dispatchEventInternal(RawPtr<Event> event)
|
| {
|
| m_eventNestingLevel++;
|
| DispatchEventResult dispatchResult = WorkerGlobalScope::dispatchEventInternal(event.get());
|
| @@ -177,7 +177,7 @@ DispatchEventResult ServiceWorkerGlobalScope::dispatchEventInternal(PassRefPtrWi
|
| return dispatchResult;
|
| }
|
|
|
| -void ServiceWorkerGlobalScope::dispatchExtendableEvent(PassRefPtrWillBeRawPtr<Event> event, WaitUntilObserver* observer)
|
| +void ServiceWorkerGlobalScope::dispatchExtendableEvent(RawPtr<Event> event, WaitUntilObserver* observer)
|
| {
|
| ASSERT(m_eventNestingLevel == 0);
|
| m_hadErrorInTopLevelEventHandler = false;
|
| @@ -206,7 +206,7 @@ void ServiceWorkerGlobalScope::importScripts(const Vector<String>& urls, Excepti
|
| WorkerGlobalScope::importScripts(urls, exceptionState);
|
| }
|
|
|
| -PassOwnPtrWillBeRawPtr<CachedMetadataHandler> ServiceWorkerGlobalScope::createWorkerScriptCachedMetadataHandler(const KURL& scriptURL, const Vector<char>* metaData)
|
| +RawPtr<CachedMetadataHandler> ServiceWorkerGlobalScope::createWorkerScriptCachedMetadataHandler(const KURL& scriptURL, const Vector<char>* metaData)
|
| {
|
| return ServiceWorkerScriptCachedMetadataHandler::create(this, scriptURL, metaData);
|
| }
|
| @@ -214,7 +214,7 @@ PassOwnPtrWillBeRawPtr<CachedMetadataHandler> ServiceWorkerGlobalScope::createWo
|
| void ServiceWorkerGlobalScope::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());
|
|
|