| 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() { }
|
|
|
| +#if !ENABLE(OILPAN)
|
| int refCount() const;
|
| -#if SECURITY_ASSERT_ENABLED
|
| +#endif
|
| +
|
| +#if SECURITY_ASSERT_ENABLED && !ENABLE(OILPAN)
|
| 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)
|
|
|