Oilpan: implement StyleRuleList without an extra wrapper.

Source/core/css/ElementRuleCollector.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 65 matching lines @@
     uint64_t m_position;
     RawPtrWillBeMember<const CSSStyleSheet> m_parentStyleSheet;
 };
 
 } // namespace blink
 
 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::MatchedRule);
 
 namespace blink {
 
-// FIXME: oilpan: when transition types are gone this class can be replaced with HeapVector.
+#if ENABLE(OILPAN)
+using StyleRuleList = HeapVector<Member<StyleRule>>;
+#else
 class StyleRuleList final : public RefCountedWillBeGarbageCollected<StyleRuleList> {

[haraken, 2015/03/10 16:16:06]

RefCountedWillBeGarbageCollected => RefCounted

[sof, 2015/03/11 10:53:32]

Thanks, missed that one - fixed.

 public:
-    static PassRefPtrWillBeRawPtr<StyleRuleList> create() { return adoptRefWillBeNoop(new StyleRuleList()); }
+    static PassRefPtr<StyleRuleList> create() { return adoptRef(new StyleRuleList()); }
 
-    DEFINE_INLINE_TRACE()
-    {
-#if ENABLE(OILPAN)
-        visitor->trace(m_list);
+    void append(StyleRule* rule) { m_list.append(rule); }
+    StyleRule* at(size_t index) const { return m_list[index]; }
+    size_t size() const { return m_list.size(); }
+
+    Vector<StyleRule*> m_list;
+};
 #endif
-    }
-
-    WillBeHeapVector<RawPtrWillBeMember<StyleRule> > m_list;
-};
 
 // ElementRuleCollector is designed to be used as a stack object.
 // Create one, ask what rules the ElementResolveContext matches
 // and then let it go out of scope.
 // FIXME: Currently it modifies the LayoutStyle but should not!
 class ElementRuleCollector {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(ElementRuleCollector);
 public:
     ElementRuleCollector(const ElementResolveContext&, const SelectorFilter&, LayoutStyle* = 0);
@@ skipping 60 matching lines @@
 
     // Output.
     RefPtrWillBeMember<StaticCSSRuleList> m_cssRuleList;
     RefPtrWillBeMember<StyleRuleList> m_styleRuleList;
     MatchResult m_result;
 };
 
 } // namespace blink
 
 #endif // ElementRuleCollector_h