Oilpan: Make the Node hierarchy RefCountedGarbageCollected instead of TreeShared.

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 80 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);
 
     bool applyAuthorStyles() const;
 
     // 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(); }
 
 
 #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.
@@ skipping 25 matching lines @@
 
     Element* getElementByAccessKey(const String& key) const;
 
     virtual void trace(Visitor*);
 
 protected:
     TreeScope(ContainerNode&, Document&);
     TreeScope(Document&);
     virtual ~TreeScope();
 
     void destroyTreeScopeData();

[haraken, 2014/05/06 15:59:42]

You can add #if !ENABLE(OILPAN) to this method.

[Mads Ager (chromium), 2014/05/07 12:13:16]

Done.

     void setDocument(Document& document) { m_document = &document; }
     void setParentTreeScope(TreeScope&);
 
 #if !ENABLE(OILPAN)
     bool hasGuardRefCount() const { return m_guardRefCount; }
 #endif
 
     void setNeedsStyleRecalcForViewportUnits();
 
 private:
     virtual void dispose() { }

[haraken, 2014/05/06 15:59:42]

You can add #if !ENABLE(OILPAN) to this method and ShadowRoot::dispose(). In
oilpan, we only need Document::dispose().

[Mads Ager (chromium), 2014/05/07 12:13:16]

I left this one in so I don't have to change the declaration of dispose in
Document. We can ifdef this one out when we can remove dispose on Document as
well.

 
+#if !ENABLE(OILPAN)
     int refCount() const;
-#if SECURITY_ASSERT_ENABLED
+#endif
+
+#if SECURITY_ASSERT_ENABLED && !ENABLE(OILPAN)

[haraken, 2014/05/06 15:59:42]

This should be:

#if !ENABLE(OILPAN)
int refCount() const;
#if SECURITY_ASSERT_ENABLED
...
#else
...
#endif
#endif

[Mads Ager (chromium), 2014/05/07 12:13:16]

Done.

     bool deletionHasBegun();
     void beginDeletion();
 #else
     bool deletionHasBegun() { return false; }
     void beginDeletion() { }
 #endif
 
     bool rootNodeHasTreeSharedParent() const;
 
-    Node& m_rootNode;
-    Document* m_document;
+    RawPtrWillBeMember<Node> m_rootNode;
+    RawPtrWillBeMember<Document> m_document;
     RawPtrWillBeMember<TreeScope> m_parentTreeScope;
 
 #if !ENABLE(OILPAN)
     int m_guardRefCount;
 #endif
 
     OwnPtr<DocumentOrderedMap> m_elementsById;
     OwnPtr<DocumentOrderedMap> m_imageMapsByName;
     OwnPtr<DocumentOrderedMap> m_labelsByForAttribute;
 
@@ skipping 19 matching lines @@
 inline bool operator!=(const TreeScope& a, const TreeScope& b) { return !(a == b); }
 inline bool operator!=(const TreeScope& a, const TreeScope* b) { return !(a == b); }
 inline bool operator!=(const TreeScope* a, const TreeScope& b) { return !(a == b); }
 
 HitTestResult hitTestInDocument(const Document*, int x, int y);
 TreeScope* commonTreeScope(Node*, Node*);
 
 } // namespace WebCore
 
 #endif // TreeScope_h