Revert of [Oilpan] Prepare full definition of classes before using Member

third_party/WebKit/Source/core/dom/TreeScope.h

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  * Copyright (C) 2012 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 46 matching lines @@
     bool isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(const TreeScope&) const;
 
     Element* adjustedFocusedElement() const;
     Element* getElementById(const AtomicString&) const;
     const WillBeHeapVector<RawPtrWillBeMember<Element>>& getAllElementsById(const AtomicString&) const;
     bool hasElementWithId(const AtomicString& id) const;
     bool containsMultipleElementsWithId(const AtomicString& id) const;
     void addElementById(const AtomicString& elementId, Element*);
     void removeElementById(const AtomicString& elementId, Element*);
 
-    Document& document() const;
+    Document& document() const
+    {
+        ASSERT(m_document);
+        return *m_document;
+    }
 
     Node* ancestorInThisScope(Node*) const;
 
     void addImageMap(HTMLMapElement*);
     void removeImageMap(HTMLMapElement*);
     HTMLMapElement* getImageMap(const String& url) const;
 
     Element* elementFromPoint(int x, int y) const;
     Element* hitTestPoint(int x, int y, const HitTestRequest&) const;
     WillBeHeapVector<RawPtrWillBeMember<Element>> elementsFromPoint(int x, int y) const;
@@ skipping 12 matching lines @@
     // for an anchor with the given name. ID matching is always case sensitive, but
     // Anchor name matching is case sensitive in strict mode and not case sensitive in
     // quirks mode for historical compatibility reasons.
     Element* findAnchor(const String& name);
 
     // Used by the basic DOM mutation methods (e.g., appendChild()).
     void adoptIfNeeded(Node&);
 
     ContainerNode& rootNode() const { return *m_rootNode; }
 
-    IdTargetObserverRegistry& idTargetObserverRegistry() const;
+    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
     // node that outlives its scope to still have a valid document
     // pointer without introducing reference cycles.
     void guardRef()
     {
         ASSERT(!deletionHasBegun());
@@ skipping 17 matching lines @@
     bool isInclusiveAncestorOf(const TreeScope&) const;
     unsigned short comparePosition(const TreeScope&) const;
 
     const TreeScope* commonAncestorTreeScope(const TreeScope& other) const;
     TreeScope* commonAncestorTreeScope(TreeScope& other);
 
     Element* getElementByAccessKey(const String& key) const;
 
     DECLARE_VIRTUAL_TRACE();
 
-    ScopedStyleResolver* scopedStyleResolver() const;
+    ScopedStyleResolver* scopedStyleResolver() const { return m_scopedStyleResolver.get(); }
     ScopedStyleResolver& ensureScopedStyleResolver();
     void clearScopedStyleResolver();
 
 protected:
     TreeScope(ContainerNode&, Document&);
     TreeScope(Document&);
     virtual ~TreeScope();
 
 #if !ENABLE(OILPAN)
     void destroyTreeScopeData();
 #endif
 
-    void setDocument(Document&);
+    void setDocument(Document& document) { m_document = &document; }
     void setParentTreeScope(TreeScope&);
 
 #if !ENABLE(OILPAN)
     bool hasGuardRefCount() const { return m_guardRefCount; }
 #endif
 
     void setNeedsStyleRecalcForViewportUnits();
 
 private:
 #if !ENABLE(OILPAN)
@@ skipping 42 matching lines @@
     return m_elementsById && m_elementsById->containsMultiple(id);
 }
 
 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(TreeScope)
 
 HitTestResult hitTestInDocument(const Document*, int x, int y, const HitTestRequest& = HitTestRequest::ReadOnly | HitTestRequest::Active);
 
 } // namespace blink
 
 #endif // TreeScope_h