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

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

Issue 262093006: Oilpan: Make the Node hierarchy RefCountedGarbageCollected instead of TreeShared. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Another build fix. Created 6 years, 7 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: Source/core/dom/TreeScope.h
diff --git a/Source/core/dom/TreeScope.h b/Source/core/dom/TreeScope.h
index 9c61b1bebbd832f48714fab105bba36c7d6459de..186615a386061f95e0481f17ba9df429e813ac29 100644
--- a/Source/core/dom/TreeScope.h
+++ b/Source/core/dom/TreeScope.h
@@ -98,7 +98,7 @@ public:
// Used by the basic DOM mutation methods (e.g., appendChild()).
void adoptIfNeeded(Node&);
- Node& rootNode() const { return m_rootNode; }
+ Node& rootNode() const { return *m_rootNode; }
IdTargetObserverRegistry& idTargetObserverRegistry() const { return *m_idTargetObserverRegistry.get(); }
@@ -157,8 +157,11 @@ protected:
private:
virtual void dispose() { }
haraken 2014/05/06 15:59:42 You can add #if !ENABLE(OILPAN) to this method and
Mads Ager (chromium) 2014/05/07 12:13:16 I left this one in so I don't have to change the d
+#if !ENABLE(OILPAN)
int refCount() const;
-#if SECURITY_ASSERT_ENABLED
+#endif
+
+#if SECURITY_ASSERT_ENABLED && !ENABLE(OILPAN)
haraken 2014/05/06 15:59:42 This should be: #if !ENABLE(OILPAN) int refCount(
Mads Ager (chromium) 2014/05/07 12:13:16 Done.
bool deletionHasBegun();
void beginDeletion();
#else
@@ -168,8 +171,8 @@ private:
bool rootNodeHasTreeSharedParent() const;
- Node& m_rootNode;
- Document* m_document;
+ RawPtrWillBeMember<Node> m_rootNode;
+ RawPtrWillBeMember<Document> m_document;
RawPtrWillBeMember<TreeScope> m_parentTreeScope;
#if !ENABLE(OILPAN)

Powered by Google App Engine
This is Rietveld 408576698