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

Unified Diff: third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp

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/inspector/AsyncCallTracker.cpp
diff --git a/third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp b/third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp
index 9abb8d8c2a9432a08975b090861bd57a4feb995b..2b83d47d3ec285a3b73d5b191c027e0c935498cf 100644
--- a/third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp
+++ b/third_party/WebKit/Source/core/inspector/AsyncCallTracker.cpp
@@ -54,9 +54,8 @@ static const char enqueueMutationRecordName[] = "Mutation";
namespace blink {
-class AsyncCallTracker::ExecutionContextData final : public NoBaseWillBeGarbageCollectedFinalized<ExecutionContextData>, public ContextLifecycleObserver {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(AsyncCallTracker::ExecutionContextData);
- USING_FAST_MALLOC_WILL_BE_REMOVED(AsyncCallTracker::ExecutionContextData);
+class AsyncCallTracker::ExecutionContextData final : public GarbageCollectedFinalized<ExecutionContextData>, public ContextLifecycleObserver {
+ USING_GARBAGE_COLLECTED_MIXIN(AsyncCallTracker::ExecutionContextData);
public:
ExecutionContextData(AsyncCallTracker* tracker, ExecutionContext* executionContext)
: ContextLifecycleObserver(executionContext)
@@ -74,7 +73,7 @@ public:
void contextDestroyed() override
{
ASSERT(getExecutionContext());
- OwnPtrWillBeRawPtr<ExecutionContextData> self = m_tracker->m_executionContextDataMap.take(getExecutionContext());
+ RawPtr<ExecutionContextData> self = m_tracker->m_executionContextDataMap.take(getExecutionContext());
ASSERT_UNUSED(self, self == this);
ContextLifecycleObserver::contextDestroyed();
disposeCallChains();
@@ -101,13 +100,13 @@ public:
ContextLifecycleObserver::trace(visitor);
}
- RawPtrWillBeMember<AsyncCallTracker> m_tracker;
+ Member<AsyncCallTracker> m_tracker;
HashSet<int> m_intervalTimerIds;
AsyncOperationMap<int> m_timerCallChains;
AsyncOperationMap<int> m_animationFrameCallChains;
- AsyncOperationMap<RawPtrWillBeMember<Event>> m_eventCallChains;
- AsyncOperationMap<RawPtrWillBeMember<EventTarget>> m_xhrCallChains;
- AsyncOperationMap<RawPtrWillBeMember<MutationObserver>> m_mutationObserverCallChains;
+ AsyncOperationMap<Member<Event>> m_eventCallChains;
+ AsyncOperationMap<Member<EventTarget>> m_xhrCallChains;
+ AsyncOperationMap<Member<MutationObserver>> m_mutationObserverCallChains;
AsyncOperationMap<ExecutionContextTask*> m_executionContextTaskCallChains;
AsyncOperationMap<int> m_asyncOperations;
@@ -416,7 +415,7 @@ AsyncCallTracker::ExecutionContextData* AsyncCallTracker::createContextDataIfNee
{
ExecutionContextData* data = m_executionContextDataMap.get(context);
if (!data) {
- data = m_executionContextDataMap.set(context, adoptPtrWillBeNoop(new AsyncCallTracker::ExecutionContextData(this, context)))
+ data = m_executionContextDataMap.set(context, new AsyncCallTracker::ExecutionContextData(this, context))
.storedValue->value.get();
}
return data;

Powered by Google App Engine
This is Rietveld 408576698