| Index: Source/core/dom/TreeScope.h
|
| diff --git a/Source/core/dom/TreeScope.h b/Source/core/dom/TreeScope.h
|
| index 994359d3587dea44b41294716cfa26d06358dd8a..76b143b2e4e93839099e41f8a1eb435356fad7ee 100644
|
| --- a/Source/core/dom/TreeScope.h
|
| +++ b/Source/core/dom/TreeScope.h
|
| @@ -64,7 +64,11 @@ public:
|
| void addElementById(const AtomicString& elementId, Element*);
|
| void removeElementById(const AtomicString& elementId, Element*);
|
|
|
| - Document* documentScope() const { return m_documentScope; }
|
| + Document& documentScope() const
|
| + {
|
| + ASSERT(m_documentScope);
|
| + return *m_documentScope;
|
| + }
|
|
|
| Node* ancestorInThisScope(Node*) const;
|
|
|
| @@ -135,12 +139,7 @@ protected:
|
| virtual ~TreeScope();
|
|
|
| void destroyTreeScopeData();
|
| - void clearDocumentScope();
|
| - void setDocumentScope(Document* document)
|
| - {
|
| - ASSERT(document);
|
| - m_documentScope = document;
|
| - }
|
| + void setDocumentScope(Document& document) { m_documentScope = &document; }
|
|
|
| bool hasGuardRefCount() const { return m_guardRefCount; }
|
|
|
| @@ -149,8 +148,6 @@ protected:
|
| void setBaseURL(const KURL& baseURL) { m_baseURL = baseURL; }
|
|
|
| private:
|
| - TreeScope();
|
| -
|
| virtual void dispose() { }
|
|
|
| int refCount() const;
|
|
|