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

Unified Diff: third_party/WebKit/Source/core/dom/NodeRareData.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, 10 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/NodeRareData.h
diff --git a/third_party/WebKit/Source/core/dom/NodeRareData.h b/third_party/WebKit/Source/core/dom/NodeRareData.h
index 4621a0c231360d0df485c54d70078bee5badff2a..8d59605857bebe66fb2c1d9103ffe3a127b328f8 100644
--- a/third_party/WebKit/Source/core/dom/NodeRareData.h
+++ b/third_party/WebKit/Source/core/dom/NodeRareData.h
@@ -31,16 +31,15 @@
namespace blink {
-class NodeMutationObserverData final : public NoBaseWillBeGarbageCollected<NodeMutationObserverData> {
+class NodeMutationObserverData final : public GarbageCollected<NodeMutationObserverData> {
WTF_MAKE_NONCOPYABLE(NodeMutationObserverData);
- USING_FAST_MALLOC_WILL_BE_REMOVED(NodeMutationObserverData);
public:
- WillBeHeapVector<OwnPtrWillBeMember<MutationObserverRegistration>> registry;
- WillBeHeapHashSet<RawPtrWillBeMember<MutationObserverRegistration>> transientRegistry;
+ HeapVector<Member<MutationObserverRegistration>> registry;
+ HeapHashSet<Member<MutationObserverRegistration>> transientRegistry;
- static PassOwnPtrWillBeRawPtr<NodeMutationObserverData> create()
+ static RawPtr<NodeMutationObserverData> create()
{
- return adoptPtrWillBeNoop(new NodeMutationObserverData);
+ return (new NodeMutationObserverData);
}
DEFINE_INLINE_TRACE()
@@ -55,9 +54,8 @@ private:
NodeMutationObserverData() { }
};
-class NodeRareData : public NoBaseWillBeGarbageCollectedFinalized<NodeRareData>, public NodeRareDataBase {
+class NodeRareData : public GarbageCollectedFinalized<NodeRareData>, public NodeRareDataBase {
WTF_MAKE_NONCOPYABLE(NodeRareData);
- USING_FAST_MALLOC_WILL_BE_REMOVED(NodeRareData);
public:
static NodeRareData* create(LayoutObject* layoutObject)
{
@@ -118,8 +116,8 @@ protected:
{ }
private:
- OwnPtrWillBeMember<NodeListsNodeData> m_nodeLists;
- OwnPtrWillBeMember<NodeMutationObserverData> m_mutationObserverData;
+ Member<NodeListsNodeData> m_nodeLists;
+ Member<NodeMutationObserverData> m_mutationObserverData;
unsigned m_connectedFrameCount : ConnectedFrameCountBits;
unsigned m_elementFlags : NumberOfElementFlags;

Powered by Google App Engine
This is Rietveld 408576698