| Index: third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
|
| diff --git a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
|
| index c1b11f566f91f0131fb27d912640968b95842474..e5b8fe1275a26cfdb4e6d1a2d13602428381fd50 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
|
| @@ -53,7 +53,6 @@
|
| #include "core/inspector/InspectorConsoleInstrumentation.h"
|
| #include "core/inspector/WorkerInspectorController.h"
|
| #include "core/loader/WorkerThreadableLoader.h"
|
| -#include "core/workers/WorkerNavigator.h"
|
| #include "core/workers/WorkerClients.h"
|
| #include "core/workers/WorkerLoaderProxy.h"
|
| #include "core/workers/WorkerLocation.h"
|
| @@ -67,10 +66,11 @@
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebScheduler.h"
|
| #include "public/platform/WebURLRequest.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| -WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilageData, WorkerClients* workerClients)
|
| +WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerThread* thread, double timeOrigin, std::unique_ptr<SecurityOrigin::PrivilegeData> starterOriginPrivilageData, WorkerClients* workerClients)
|
| : m_url(url)
|
| , m_userAgent(userAgent)
|
| , m_v8CacheOptions(V8CacheOptionsDefault)
|
| @@ -253,7 +253,7 @@ void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState
|
| scriptLoaded(scriptLoader->script().length(), scriptLoader->cachedMetadata() ? scriptLoader->cachedMetadata()->size() : 0);
|
|
|
| ErrorEvent* errorEvent = nullptr;
|
| - OwnPtr<Vector<char>> cachedMetaData(scriptLoader->releaseCachedMetadata());
|
| + std::unique_ptr<Vector<char>> cachedMetaData(scriptLoader->releaseCachedMetadata());
|
| CachedMetadataHandler* handler(createWorkerScriptCachedMetadataHandler(completeURL, cachedMetaData.get()));
|
| m_scriptController->evaluate(ScriptSourceCode(scriptLoader->script(), scriptLoader->responseURL()), &errorEvent, handler, m_v8CacheOptions);
|
| if (errorEvent) {
|
| @@ -268,7 +268,7 @@ EventTarget* WorkerGlobalScope::errorEventTarget()
|
| return this;
|
| }
|
|
|
| -void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, PassOwnPtr<SourceLocation> location)
|
| +void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, std::unique_ptr<SourceLocation> location)
|
| {
|
| thread()->workerReportingProxy().reportException(errorMessage, std::move(location));
|
| }
|
| @@ -346,7 +346,7 @@ ConsoleMessageStorage* WorkerGlobalScope::messageStorage()
|
| return m_messageStorage.get();
|
| }
|
|
|
| -void WorkerGlobalScope::exceptionUnhandled(const String& errorMessage, PassOwnPtr<SourceLocation> location)
|
| +void WorkerGlobalScope::exceptionUnhandled(const String& errorMessage, std::unique_ptr<SourceLocation> location)
|
| {
|
| addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage, std::move(location)));
|
| }
|
|
|