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

Unified Diff: Source/core/dom/Node.h

Issue 324073002: Oilpan: Switch RefCountedGarbageCollected to GarbageCollectedFinalized for Node. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and update Node base class list Created 6 years, 6 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
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | Source/core/dom/ProcessingInstruction.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Node.h
diff --git a/Source/core/dom/Node.h b/Source/core/dom/Node.h
index a31b1981a22472593004d72510ce543e089eca73..b8f6a60801b7c2e75bc7de95e8ec3bdd7e759395 100644
--- a/Source/core/dom/Node.h
+++ b/Source/core/dom/Node.h
@@ -107,12 +107,20 @@ private:
RenderObject* m_renderer;
};
-class Node : public EventTarget, public ScriptWrappable, public TreeSharedWillBeRefCountedGarbageCollected<Node> {
+#if ENABLE(OILPAN)
+#define NODE_BASE_CLASSES public GarbageCollectedFinalized<Node>, public EventTarget, public ScriptWrappable
+#else
+// TreeShared should be the last to pack TreeShared::m_refCount and
+// Node::m_nodeFlags on 64bit platforms.
+#define NODE_BASE_CLASSES public EventTarget, public ScriptWrappable, public TreeShared<Node>
+#endif
+
+class Node : NODE_BASE_CLASSES {
friend class Document;
friend class TreeScope;
friend class TreeScopeAdopter;
- DEFINE_EVENT_TARGET_REFCOUNTING(TreeSharedWillBeRefCountedGarbageCollected<Node>);
+ DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(TreeShared<Node>);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Node);
public:
enum NodeType {
@@ -893,7 +901,7 @@ DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES_REFCOUNTED(Node)
#define DEFINE_NODE_FACTORY(T) \
PassRefPtrWillBeRawPtr<T> T::create(Document& document) \
{ \
- return adoptRefWillBeRefCountedGarbageCollected(new T(document)); \
+ return adoptRefWillBeNoop(new T(document)); \
}
} // namespace WebCore
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | Source/core/dom/ProcessingInstruction.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698