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

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

Issue 235113002: Oilpan: Remove guardRef and guardDeref from TreeScope. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase again. Created 6 years, 8 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 288e2d533ed0c3a1d900ad74aa7d4d6e33a058d9..cc7ab175e91ed390c9c582aeeb35edfd98d19deb 100644
--- a/Source/core/dom/TreeScope.h
+++ b/Source/core/dom/TreeScope.h
@@ -102,6 +102,8 @@ public:
IdTargetObserverRegistry& idTargetObserverRegistry() const { return *m_idTargetObserverRegistry.get(); }
+
+#if !ENABLE(OILPAN)
// Nodes belonging to this scope hold guard references -
// these are enough to keep the scope from being destroyed, but
// not enough to keep it from removing its children. This allows a
@@ -137,6 +139,7 @@ public:
}
#endif
}
+#endif
void removedLastRefToScope();
@@ -156,6 +159,8 @@ public:
Element* getElementByAccessKey(const String& key) const;
+ virtual void trace(Visitor*);
+
protected:
TreeScope(ContainerNode&, Document&);
TreeScope(Document&);
@@ -185,7 +190,7 @@ private:
Node& m_rootNode;
Document* m_document;
- TreeScope* m_parentTreeScope;
+ RawPtrWillBeMember<TreeScope> m_parentTreeScope;
int m_guardRefCount;
OwnPtr<DocumentOrderedMap> m_elementsById;

Powered by Google App Engine
This is Rietveld 408576698