[Oilpan]: Move HTMLStackItem and friends to the oilpan heap.

Source/core/html/parser/HTMLElementStack.h

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  * Copyright (C) 2011 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 26 matching lines @@
 namespace WebCore {
 
 class ContainerNode;
 class DocumentFragment;
 class Element;
 class QualifiedName;
 
 // NOTE: The HTML5 spec uses a backwards (grows downward) stack.  We're using
 // more standard (grows upwards) stack terminology here.
 class HTMLElementStack {
-    WTF_MAKE_NONCOPYABLE(HTMLElementStack); WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_NONCOPYABLE(HTMLElementStack);
+    DISALLOW_ALLOCATION();
 public:
     HTMLElementStack();
     ~HTMLElementStack();
 
-    class ElementRecord {
-        WTF_MAKE_NONCOPYABLE(ElementRecord); WTF_MAKE_FAST_ALLOCATED;
+    class ElementRecord : public NoBaseWillBeGarbageCollected<ElementRecord> {

[Mads Ager (chromium), 2014/05/27 10:32:03]

add FINAL since the trace method is not virtual?

[wibling-chromium, 2014/05/27 10:45:46]

Done.

+        WTF_MAKE_NONCOPYABLE(ElementRecord); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
     public:
+#if !ENABLE(OILPAN)
         ~ElementRecord(); // Public for ~PassOwnPtr()
+#endif

[haraken, 2014/05/27 10:48:22]

You can use DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED

[wibling-chromium, 2014/05/27 11:16:36]

I tried it, but it doesn't work since it is a nested class so it expands
incorrectly.

 
         Element* element() const { return m_item->element(); }
         ContainerNode* node() const { return m_item->node(); }
         const AtomicString& namespaceURI() const { return m_item->namespaceURI(); }
-        PassRefPtr<HTMLStackItem> stackItem() const { return m_item; }
-        void replaceElement(PassRefPtr<HTMLStackItem>);
+        PassRefPtrWillBeRawPtr<HTMLStackItem> stackItem() const { return m_item; }
+        void replaceElement(PassRefPtrWillBeRawPtr<HTMLStackItem>);
 
         bool isAbove(ElementRecord*) const;
 
         ElementRecord* next() const { return m_next.get(); }
+
+        void trace(Visitor*);
     private:
         friend class HTMLElementStack;
 
-        ElementRecord(PassRefPtr<HTMLStackItem>, PassOwnPtr<ElementRecord>);
+        ElementRecord(PassRefPtrWillBeRawPtr<HTMLStackItem>, PassOwnPtrWillBeRawPtr<ElementRecord>);
 
-        PassOwnPtr<ElementRecord> releaseNext() { return m_next.release(); }
-        void setNext(PassOwnPtr<ElementRecord> next) { m_next = next; }
+        PassOwnPtrWillBeRawPtr<ElementRecord> releaseNext() { return m_next.release(); }
+        void setNext(PassOwnPtrWillBeRawPtr<ElementRecord> next) { m_next = next; }
 
-        RefPtr<HTMLStackItem> m_item;
-        OwnPtr<ElementRecord> m_next;
+        RefPtrWillBeMember<HTMLStackItem> m_item;
+        OwnPtrWillBeMember<ElementRecord> m_next;
     };
 
     unsigned stackDepth() const { return m_stackDepth; }
 
     // Inlining this function is a (small) performance win on the parsing
     // benchmark.
     Element* top() const
     {
         ASSERT(m_top->element());
         return m_top->element();
@@ skipping 10 matching lines @@
         ASSERT(m_top->stackItem());
         return m_top->stackItem().get();
     }
 
     HTMLStackItem* oneBelowTop() const;
     ElementRecord* topRecord() const;
     ElementRecord* find(Element*) const;
     ElementRecord* furthestBlockForFormattingElement(Element*) const;
     ElementRecord* topmost(const AtomicString& tagName) const;
 
-    void insertAbove(PassRefPtr<HTMLStackItem>, ElementRecord*);
+    void insertAbove(PassRefPtrWillBeRawPtr<HTMLStackItem>, ElementRecord*);
 
-    void push(PassRefPtr<HTMLStackItem>);
-    void pushRootNode(PassRefPtr<HTMLStackItem>);
-    void pushHTMLHtmlElement(PassRefPtr<HTMLStackItem>);
-    void pushHTMLHeadElement(PassRefPtr<HTMLStackItem>);
-    void pushHTMLBodyElement(PassRefPtr<HTMLStackItem>);
+    void push(PassRefPtrWillBeRawPtr<HTMLStackItem>);
+    void pushRootNode(PassRefPtrWillBeRawPtr<HTMLStackItem>);
+    void pushHTMLHtmlElement(PassRefPtrWillBeRawPtr<HTMLStackItem>);
+    void pushHTMLHeadElement(PassRefPtrWillBeRawPtr<HTMLStackItem>);
+    void pushHTMLBodyElement(PassRefPtrWillBeRawPtr<HTMLStackItem>);
 
     void pop();
     void popUntil(const AtomicString& tagName);
     void popUntil(Element*);
     void popUntilPopped(const AtomicString& tagName);
     void popUntilPopped(const QualifiedName& tagName) { popUntilPopped(tagName.localName()); }
 
     void popUntilPopped(Element*);
     void popUntilNumberedHeaderElementPopped();
     void popUntilTableScopeMarker(); // "clear the stack back to a table context" in the spec.
@@ skipping 29 matching lines @@
 
     bool hasOnlyOneElement() const;
     bool secondElementIsHTMLBodyElement() const;
     bool hasTemplateInHTMLScope() const;
     Element* htmlElement() const;
     Element* headElement() const;
     Element* bodyElement() const;
 
     ContainerNode* rootNode() const;
 
+    void trace(Visitor*);
+
 #ifndef NDEBUG
     void show();
 #endif
 
 private:
-    void pushCommon(PassRefPtr<HTMLStackItem>);
-    void pushRootNodeCommon(PassRefPtr<HTMLStackItem>);
+    void pushCommon(PassRefPtrWillBeRawPtr<HTMLStackItem>);
+    void pushRootNodeCommon(PassRefPtrWillBeRawPtr<HTMLStackItem>);
     void popCommon();
     void removeNonTopCommon(Element*);
 
-    OwnPtr<ElementRecord> m_top;
+    OwnPtrWillBeMember<ElementRecord> m_top;
 
     // We remember the root node, <head> and <body> as they are pushed. Their
     // ElementRecords keep them alive. The root node is never popped.
     // FIXME: We don't currently require type-specific information about
     // these elements so we haven't yet bothered to plumb the types all the
     // way down through createElement, etc.
     ContainerNode* m_rootNode;
     Element* m_headElement;
     Element* m_bodyElement;

[haraken, 2014/05/27 10:48:22]

Shall we make these pointers Members? I'm not really happy with leaving raw
pointers in on-heap objects :)

[wibling-chromium, 2014/05/27 11:16:36]

Done.

     unsigned m_stackDepth;
 };
 
 } // namespace WebCore
 
 #endif // HTMLElementStack_h