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

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

Issue 235113002: Oilpan: Remove guardRef and guardDeref from TreeScope. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments. 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
« no previous file with comments | « Source/core/dom/EventHandlerRegistry.cpp ('k') | Source/core/dom/Node.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 f77f3fa23a0dbe8bb7c9fe7dc78724d8c04527a8..733c83148adb01813108ed0849ed16ae87908c18 100644
--- a/Source/core/dom/Node.h
+++ b/Source/core/dom/Node.h
@@ -673,7 +673,7 @@ public:
bool isFinishedParsingChildren() const { return getFlag(IsFinishedParsingChildrenFlag); }
- virtual void trace(Visitor*) { }
+ virtual void trace(Visitor*);
private:
enum NodeFlags {
@@ -755,8 +755,10 @@ protected:
{
ASSERT(m_treeScope || type == CreateDocument || type == CreateShadowRoot);
ScriptWrappable::init(this);
+#if !ENABLE(OILPAN)
if (m_treeScope)
m_treeScope->guardRef();
+#endif
#if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
trackForDebugging();
@@ -768,7 +770,9 @@ protected:
static void reattachWhitespaceSiblings(Text* start);
+#if !ENABLE(OILPAN)
void willBeDeletedFromDocument();
+#endif
bool hasRareData() const { return getFlag(HasRareDataFlag); }
@@ -776,7 +780,9 @@ protected:
NodeRareData& ensureRareData();
void clearRareData();
+#if !ENABLE(OILPAN)
void clearEventTargetData();
+#endif
void setHasCustomStyleCallbacks() { setFlag(true, HasCustomStyleCallbacksFlag); }
@@ -828,7 +834,7 @@ private:
mutable uint32_t m_nodeFlags;
ContainerNode* m_parentOrShadowHostNode;
- TreeScope* m_treeScope;
+ RawPtrWillBeMember<TreeScope> m_treeScope;
Node* m_previous;
Node* m_next;
// When a node has rare data we move the renderer into the rare data.
« no previous file with comments | « Source/core/dom/EventHandlerRegistry.cpp ('k') | Source/core/dom/Node.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698