Oilpan: Remove raw pointer to DescendantInvalidationSet from StyleInvalidator::RecursionData

Source/core/css/invalidation/StyleInvalidator.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef StyleInvalidator_h
 #define StyleInvalidator_h
 
 #include "platform/heap/Handle.h"
 #include "wtf/Noncopyable.h"
 
@@ skipping 11 matching lines @@
     ~StyleInvalidator();
     void invalidate(Document&);
     void scheduleInvalidation(PassRefPtrWillBeRawPtr<DescendantInvalidationSet>, Element&);
     void clearInvalidation(Element&);
 
     void clearPendingInvalidations();
 
     DECLARE_TRACE();
 
 private:
-    struct RecursionData {
+    class RecursionData {
+        DISALLOW_ALLOCATION();

[sof, 2015/07/22 06:08:42]

STACK_ALLOCATED() ?

[keishi, 2015/07/22 06:30:47]

Done.

+    public:
         RecursionData()
             : m_invalidateCustomPseudo(false)
             , m_wholeSubtreeInvalid(false)
             , m_treeBoundaryCrossing(false)
             , m_insertionPointCrossing(false)
         { }
 
+        DEFINE_INLINE_TRACE()

[sof, 2015/07/22 06:08:42]

Don't need this, as the backing store will be marked&traced, initiated by
conservative scanning of the stack.

[keishi, 2015/07/22 06:30:47]

Done.

+        {
+#if ENABLE(OILPAN)
+            visitor->trace(m_invalidationSets);
+#endif
+        }
+
         void pushInvalidationSet(const DescendantInvalidationSet&);
         bool matchesCurrentInvalidationSets(Element&);
         bool hasInvalidationSets() const { return !wholeSubtreeInvalid() && m_invalidationSets.size(); }
 
         bool wholeSubtreeInvalid() const { return m_wholeSubtreeInvalid; }
         void setWholeSubtreeInvalid() { m_wholeSubtreeInvalid = true; }
 
         bool treeBoundaryCrossing() const { return m_treeBoundaryCrossing; }
         bool insertionPointCrossing() const { return m_insertionPointCrossing; }
 
-        using InvalidationSets = Vector<const DescendantInvalidationSet*, 16>;
+        using InvalidationSets = WillBeHeapVector<RawPtrWillBeMember<const DescendantInvalidationSet>, 16>;
         InvalidationSets m_invalidationSets;
         bool m_invalidateCustomPseudo;
         bool m_wholeSubtreeInvalid;
         bool m_treeBoundaryCrossing;
         bool m_insertionPointCrossing;
     };
 
     bool invalidate(Element&, RecursionData&);
     bool invalidateChildren(Element&, RecursionData&);
     bool checkInvalidationSetsAgainstElement(Element&, RecursionData&);
 
     class RecursionCheckpoint {
+        DISALLOW_ALLOCATION();

[sof, 2015/07/22 06:08:42]

STACK_ALLOCATED() ?

[keishi, 2015/07/22 06:30:47]

Done.

     public:
         RecursionCheckpoint(RecursionData* data)
             : m_prevInvalidationSetsSize(data->m_invalidationSets.size())
             , m_prevInvalidateCustomPseudo(data->m_invalidateCustomPseudo)
             , m_prevWholeSubtreeInvalid(data->m_wholeSubtreeInvalid)
             , m_treeBoundaryCrossing(data->m_treeBoundaryCrossing)
             , m_insertionPointCrossing(data->m_insertionPointCrossing)
             , m_data(data)
         { }
         ~RecursionCheckpoint()
         {
             m_data->m_invalidationSets.remove(m_prevInvalidationSetsSize, m_data->m_invalidationSets.size() - m_prevInvalidationSetsSize);
             m_data->m_invalidateCustomPseudo = m_prevInvalidateCustomPseudo;
             m_data->m_wholeSubtreeInvalid = m_prevWholeSubtreeInvalid;
             m_data->m_treeBoundaryCrossing = m_treeBoundaryCrossing;
             m_data->m_insertionPointCrossing = m_insertionPointCrossing;
         }
 
     private:
         int m_prevInvalidationSetsSize;
         bool m_prevInvalidateCustomPseudo;
         bool m_prevWholeSubtreeInvalid;
         bool m_treeBoundaryCrossing;
         bool m_insertionPointCrossing;
         RecursionData* m_data;

[sof, 2015/07/22 06:08:42]

Add a comment saying that this is stack reference, and need not separate
tracing.

[keishi, 2015/07/22 06:30:47]

Done.

     };
 
     using InvalidationList = WillBeHeapVector<RefPtrWillBeMember<DescendantInvalidationSet>>;
     using PendingInvalidationMap = WillBeHeapHashMap<RawPtrWillBeMember<Element>, OwnPtrWillBeMember<InvalidationList>>;
 
     InvalidationList& ensurePendingInvalidationList(Element&);
 
     PendingInvalidationMap m_pendingInvalidationMap;
 };
 
 } // namespace blink
 
 #endif // StyleInvalidator_h