| Index: third_party/WebKit/Source/modules/worklet/WorkletGlobalScope.h
|
| diff --git a/third_party/WebKit/Source/modules/worklet/WorkletGlobalScope.h b/third_party/WebKit/Source/modules/worklet/WorkletGlobalScope.h
|
| index e26977f54bf842df352d9ffb99f455d56dbe8c01..8d7676434aca0a69d4a802dc23af8f85bcb3e3e8 100644
|
| --- a/third_party/WebKit/Source/modules/worklet/WorkletGlobalScope.h
|
| +++ b/third_party/WebKit/Source/modules/worklet/WorkletGlobalScope.h
|
| @@ -19,9 +19,9 @@ namespace blink {
|
| class EventQueue;
|
| class WorkerOrWorkletScriptController;
|
|
|
| -class WorkletGlobalScope : public RefCountedWillBeGarbageCollectedFinalized<WorkletGlobalScope>, public SecurityContext, public WorkerOrWorkletGlobalScope, public ScriptWrappable {
|
| +class WorkletGlobalScope : public GarbageCollectedFinalized<WorkletGlobalScope>, public SecurityContext, public WorkerOrWorkletGlobalScope, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkletGlobalScope);
|
| + USING_GARBAGE_COLLECTED_MIXIN(WorkletGlobalScope);
|
| public:
|
| #if !ENABLE(OILPAN)
|
| using RefCounted<WorkletGlobalScope>::ref;
|
| @@ -30,7 +30,7 @@ public:
|
|
|
| // The url and userAgent arguments are inherited from the parent
|
| // ExecutionContext for Worklets.
|
| - static PassRefPtrWillBeRawPtr<WorkletGlobalScope> create(const KURL&, const String& userAgent, v8::Isolate*);
|
| + static RawPtr<WorkletGlobalScope> create(const KURL&, const String& userAgent, v8::Isolate*);
|
| ~WorkletGlobalScope() override;
|
|
|
| bool isWorkletGlobalScope() const final { return true; }
|
| @@ -63,7 +63,7 @@ public:
|
|
|
| // TODO(ikilpatrick): implement when we implement devtools support.
|
| void reportBlockedScriptExecutionToInspector(const String& directiveText) final { }
|
| - void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) final { }
|
| + void addConsoleMessage(RawPtr<ConsoleMessage>) final { }
|
| void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) final { }
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
| @@ -84,7 +84,7 @@ private:
|
|
|
| KURL m_url;
|
| String m_userAgent;
|
| - OwnPtrWillBeMember<WorkerOrWorkletScriptController> m_script;
|
| + Member<WorkerOrWorkletScriptController> m_script;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(WorkletGlobalScope, ExecutionContext, context, context->isWorkletGlobalScope(), context.isWorkletGlobalScope());
|
|
|