| Index: third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp
|
| index 068fc1210b6d0e8a932a318d1233564dc787d5db..771dcda1aa390c4da64b4b578d0df2feaa2e289f 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp
|
| @@ -83,7 +83,7 @@ public:
|
| int columnNumber;
|
| String sourceURL;
|
| ScriptValue exception;
|
| - RefPtrWillBeMember<ErrorEvent> m_errorEventFromImportedScript;
|
| + Member<ErrorEvent> m_errorEventFromImportedScript;
|
|
|
| // A ExecutionState context is stack allocated by
|
| // WorkerOrWorkletScriptController::evaluate(), with the contoller using it
|
| @@ -96,13 +96,13 @@ public:
|
| //
|
| // With Oilpan, |m_outerState| isn't traced. It'll be "up the stack"
|
| // and its fields will be traced when scanning the stack.
|
| - RawPtrWillBeMember<WorkerOrWorkletScriptController> m_controller;
|
| + Member<WorkerOrWorkletScriptController> m_controller;
|
| ExecutionState* m_outerState;
|
| };
|
|
|
| -PassOwnPtrWillBeRawPtr<WorkerOrWorkletScriptController> WorkerOrWorkletScriptController::create(WorkerOrWorkletGlobalScope* globalScope, v8::Isolate* isolate)
|
| +RawPtr<WorkerOrWorkletScriptController> WorkerOrWorkletScriptController::create(WorkerOrWorkletGlobalScope* globalScope, v8::Isolate* isolate)
|
| {
|
| - return adoptPtrWillBeNoop(new WorkerOrWorkletScriptController(globalScope, isolate));
|
| + return (new WorkerOrWorkletScriptController(globalScope, isolate));
|
| }
|
|
|
| WorkerOrWorkletScriptController::WorkerOrWorkletScriptController(WorkerOrWorkletGlobalScope* globalScope, v8::Isolate* isolate)
|
| @@ -223,7 +223,7 @@ ScriptValue WorkerOrWorkletScriptController::evaluate(const CompressibleString&
|
| return ScriptValue(m_scriptState.get(), result);
|
| }
|
|
|
| -bool WorkerOrWorkletScriptController::evaluate(const ScriptSourceCode& sourceCode, RefPtrWillBeRawPtr<ErrorEvent>* errorEvent, CachedMetadataHandler* cacheHandler, V8CacheOptions v8CacheOptions)
|
| +bool WorkerOrWorkletScriptController::evaluate(const ScriptSourceCode& sourceCode, RawPtr<ErrorEvent>* errorEvent, CachedMetadataHandler* cacheHandler, V8CacheOptions v8CacheOptions)
|
| {
|
| if (isExecutionForbidden())
|
| return false;
|
| @@ -246,7 +246,7 @@ bool WorkerOrWorkletScriptController::evaluate(const ScriptSourceCode& sourceCod
|
| V8ErrorHandler::storeExceptionOnErrorEventWrapper(m_scriptState.get(), errorEvent->get(), state.exception.v8Value(), m_scriptState->context()->Global());
|
| } else {
|
| ASSERT(!m_globalScope->shouldSanitizeScriptError(state.sourceURL, NotSharableCrossOrigin));
|
| - RefPtrWillBeRawPtr<ErrorEvent> event = nullptr;
|
| + RawPtr<ErrorEvent> event = nullptr;
|
| if (state.m_errorEventFromImportedScript)
|
| event = state.m_errorEventFromImportedScript.release();
|
| else
|
| @@ -291,7 +291,7 @@ void WorkerOrWorkletScriptController::disableEval(const String& errorMessage)
|
| m_disableEvalPending = errorMessage;
|
| }
|
|
|
| -void WorkerOrWorkletScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBeRawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState)
|
| +void WorkerOrWorkletScriptController::rethrowExceptionFromImportedScript(RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState)
|
| {
|
| const String& errorMessage = errorEvent->message();
|
| if (m_executionState)
|
|
|