Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: third_party/WebKit/Source/core/workers/WorkerGlobalScope.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
diff --git a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
index 58169218320a876c550eaec0a23f7a5a4428971a..042871f48063ecb0bba999a3936228369871d885 100644
--- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
+++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
@@ -64,10 +64,10 @@ class WorkerLocation;
class WorkerNavigator;
class WorkerThread;
-class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public RefCountedWillBeNoBase<WorkerGlobalScope>, public SecurityContext, public WorkerOrWorkletGlobalScope, public WillBeHeapSupplementable<WorkerGlobalScope>, public DOMWindowBase64 {
+class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public SecurityContext, public WorkerOrWorkletGlobalScope, public HeapSupplementable<WorkerGlobalScope>, public DOMWindowBase64 {
DEFINE_WRAPPERTYPEINFO();
REFCOUNTED_EVENT_TARGET(WorkerGlobalScope);
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
+ USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
public:
~WorkerGlobalScope() override;
@@ -110,7 +110,7 @@ public:
// WorkerUtils
virtual void importScripts(const Vector<String>& urls, ExceptionState&);
// Returns null if caching is not supported.
- virtual PassOwnPtrWillBeRawPtr<CachedMetadataHandler> createWorkerScriptCachedMetadataHandler(const KURL& scriptURL, const Vector<char>* metaData) { return nullptr; }
+ virtual RawPtr<CachedMetadataHandler> createWorkerScriptCachedMetadataHandler(const KURL& scriptURL, const Vector<char>* metaData) { return nullptr; }
WorkerNavigator* navigator() const;
@@ -138,7 +138,7 @@ public:
using SecurityContext::getSecurityOrigin;
using SecurityContext::contentSecurityPolicy;
- void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) final;
+ void addConsoleMessage(RawPtr<ConsoleMessage>) final;
ConsoleMessageStorage* messageStorage();
void exceptionHandled(int exceptionId, bool isHandled);
@@ -153,11 +153,11 @@ public:
DECLARE_VIRTUAL_TRACE();
protected:
- WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData>, PassOwnPtrWillBeRawPtr<WorkerClients>);
+ WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData>, RawPtr<WorkerClients>);
void applyContentSecurityPolicyFromVector(const Vector<CSPHeaderAndType>& headers);
void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) override;
- void addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<ConsoleMessage>);
+ void addMessageToWorkerConsole(RawPtr<ConsoleMessage>);
void setV8CacheOptions(V8CacheOptions v8CacheOptions) { m_v8CacheOptions = v8CacheOptions; }
void removeURLFromMemoryCache(const KURL&) override;
@@ -185,31 +185,31 @@ private:
String m_userAgent;
V8CacheOptions m_v8CacheOptions;
- mutable PersistentWillBeMember<WorkerConsole> m_console;
- mutable PersistentWillBeMember<WorkerLocation> m_location;
- mutable PersistentWillBeMember<WorkerNavigator> m_navigator;
+ mutable Member<WorkerConsole> m_console;
+ mutable Member<WorkerLocation> m_location;
+ mutable Member<WorkerNavigator> m_navigator;
mutable UseCounter::CountBits m_deprecationWarningBits;
- OwnPtrWillBeMember<WorkerOrWorkletScriptController> m_scriptController;
+ Member<WorkerOrWorkletScriptController> m_scriptController;
WorkerThread* m_thread;
- RefPtrWillBeMember<WorkerInspectorController> m_workerInspectorController;
+ Member<WorkerInspectorController> m_workerInspectorController;
bool m_closing;
- OwnPtrWillBeMember<WorkerEventQueue> m_eventQueue;
+ Member<WorkerEventQueue> m_eventQueue;
- OwnPtrWillBeMember<WorkerClients> m_workerClients;
+ Member<WorkerClients> m_workerClients;
DOMTimerCoordinator m_timers;
double m_timeOrigin;
- OwnPtrWillBeMember<ConsoleMessageStorage> m_messageStorage;
+ Member<ConsoleMessageStorage> m_messageStorage;
unsigned long m_workerExceptionUniqueIdentifier;
- WillBeHeapHashMap<unsigned long, RefPtrWillBeMember<ConsoleMessage>> m_pendingMessages;
- WillBeHeapListHashSet<RefPtrWillBeMember<V8AbstractEventListener>> m_eventListeners;
+ HeapHashMap<unsigned long, Member<ConsoleMessage>> m_pendingMessages;
+ HeapListHashSet<Member<V8AbstractEventListener>> m_eventListeners;
};
DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorkerGlobalScope(), context.isWorkerGlobalScope());

Powered by Google App Engine
This is Rietveld 408576698