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

Unified Diff: third_party/WebKit/Source/core/dom/MutationObserver.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/dom/MutationObserver.cpp
diff --git a/third_party/WebKit/Source/core/dom/MutationObserver.cpp b/third_party/WebKit/Source/core/dom/MutationObserver.cpp
index 50207cd337da30c9767b41971b0c82c7097e0e90..9b7a0d9c99098720d06a562e3b37807e82b52b87 100644
--- a/third_party/WebKit/Source/core/dom/MutationObserver.cpp
+++ b/third_party/WebKit/Source/core/dom/MutationObserver.cpp
@@ -46,19 +46,19 @@ namespace blink {
static unsigned s_observerPriority = 0;
struct MutationObserver::ObserverLessThan {
- bool operator()(const RefPtrWillBeMember<MutationObserver>& lhs, const RefPtrWillBeMember<MutationObserver>& rhs)
+ bool operator()(const Member<MutationObserver>& lhs, const Member<MutationObserver>& rhs)
{
return lhs->m_priority < rhs->m_priority;
}
};
-PassRefPtrWillBeRawPtr<MutationObserver> MutationObserver::create(PassOwnPtrWillBeRawPtr<MutationCallback> callback)
+RawPtr<MutationObserver> MutationObserver::create(RawPtr<MutationCallback> callback)
{
ASSERT(isMainThread());
- return adoptRefWillBeNoop(new MutationObserver(callback));
+ return new MutationObserver(callback);
}
-MutationObserver::MutationObserver(PassOwnPtrWillBeRawPtr<MutationCallback> callback)
+MutationObserver::MutationObserver(RawPtr<MutationCallback> callback)
: m_callback(callback)
, m_priority(s_observerPriority++)
{
@@ -166,17 +166,17 @@ void MutationObserver::observationEnded(MutationObserverRegistration* registrati
static MutationObserverSet& activeMutationObservers()
{
- DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<MutationObserverSet>, activeObservers, (adoptPtrWillBeNoop(new MutationObserverSet())));
+ DEFINE_STATIC_LOCAL(Persistent<MutationObserverSet>, activeObservers, (new MutationObserverSet()));
return *activeObservers;
}
static MutationObserverSet& suspendedMutationObservers()
{
- DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<MutationObserverSet>, suspendedObservers, (adoptPtrWillBeNoop(new MutationObserverSet())));
+ DEFINE_STATIC_LOCAL(Persistent<MutationObserverSet>, suspendedObservers, (new MutationObserverSet()));
return *suspendedObservers;
}
-static void activateObserver(PassRefPtrWillBeRawPtr<MutationObserver> observer)
+static void activateObserver(RawPtr<MutationObserver> observer)
{
if (activeMutationObservers().isEmpty())
Microtask::enqueueMicrotask(WTF::bind(&MutationObserver::deliverMutations));
@@ -184,7 +184,7 @@ static void activateObserver(PassRefPtrWillBeRawPtr<MutationObserver> observer)
activeMutationObservers().add(observer);
}
-void MutationObserver::enqueueMutationRecord(PassRefPtrWillBeRawPtr<MutationRecord> mutation)
+void MutationObserver::enqueueMutationRecord(RawPtr<MutationRecord> mutation)
{
ASSERT(isMainThread());
m_records.append(mutation);
@@ -198,9 +198,9 @@ void MutationObserver::setHasTransientRegistration()
activateObserver(this);
}
-WillBeHeapHashSet<RawPtrWillBeMember<Node>> MutationObserver::getObservedNodes() const
+HeapHashSet<Member<Node>> MutationObserver::getObservedNodes() const
{
- WillBeHeapHashSet<RawPtrWillBeMember<Node>> observedNodes;
+ HeapHashSet<Member<Node>> observedNodes;
for (const auto& registration : m_registrations)
registration->addRegistrationNodesToSet(observedNodes);
return observedNodes;
@@ -217,7 +217,7 @@ void MutationObserver::deliver()
// Calling clearTransientRegistrations() can modify m_registrations, so it's necessary
// to make a copy of the transient registrations before operating on them.
- WillBeHeapVector<RawPtrWillBeMember<MutationObserverRegistration>, 1> transientRegistrations;
+ HeapVector<Member<MutationObserverRegistration>, 1> transientRegistrations;
for (auto& registration : m_registrations) {
if (registration->hasTransientRegistrations())
transientRegistrations.append(registration);
« no previous file with comments | « third_party/WebKit/Source/core/dom/MutationObserver.h ('k') | third_party/WebKit/Source/core/dom/MutationObserver.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698