Move ScopedStyleResolver and ScopedStyleTree to oilpan's heap

Source/core/css/resolver/ScopedStyleTree.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.
  * Copyright (C) 2012 Google 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.
@@ skipping 17 matching lines @@
 #define ScopedStyleTree_h
 
 #include "core/css/resolver/ScopedStyleResolver.h"
 #include "wtf/HashMap.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class ScopedStyleTree {
-    WTF_MAKE_NONCOPYABLE(ScopedStyleTree); WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_NONCOPYABLE(ScopedStyleTree);
+    DISALLOW_ALLOCATION();
 public:
     ScopedStyleTree();
     ~ScopedStyleTree();
 
     ScopedStyleResolver* ensureScopedStyleResolver(ContainerNode& scopingNode);
 
     ScopedStyleResolver* scopedStyleResolverFor(const ContainerNode& scopingNode);
 
     // for fast-path.
     bool hasOnlyScopedResolverForDocument() const { return m_authorStyles.size() == 1; }
 
-    void resolveScopedStyles(const Element*, Vector<ScopedStyleResolver*, 8>&);
-    void collectScopedResolversForHostedShadowTrees(const Element*, Vector<ScopedStyleResolver*, 8>&);
-    void resolveScopedKeyframesRules(const Element*, Vector<ScopedStyleResolver*, 8>&);
+    void resolveScopedStyles(const Element*, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>&);
+    void collectScopedResolversForHostedShadowTrees(const Element*, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>&);
+    void resolveScopedKeyframesRules(const Element*, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>&);
     ScopedStyleResolver* scopedResolverFor(const Element*);
 
     void remove(const ContainerNode* scopingNode);
 
     void pushStyleCache(const ContainerNode& scopingNode, const ContainerNode* parent);
     void popStyleCache(const ContainerNode& scopingNode);
 
     void collectFeaturesTo(RuleFeatureSet& features);
 
+    void trace(Visitor*);
+
 private:
     bool cacheIsValid(const ContainerNode* parent) const { return parent && parent == m_cache.nodeForScopedStyles; }
     void resolveStyleCache(const ContainerNode* scopingNode);
     ScopedStyleResolver* enclosingScopedStyleResolverFor(const ContainerNode* scopingNode);
 
-private:
-    HashMap<const ContainerNode*, ScopedStyleResolver*> m_authorStyles;
+    WillBeHeapHashMap<RawPtrWillBeMember<const ContainerNode>, RawPtrWillBeMember<ScopedStyleResolver> > m_authorStyles;
 
-    struct ScopedStyleCache {
-        ScopedStyleResolver* scopedResolver;
-        const ContainerNode* nodeForScopedStyles;
+    class ScopedStyleCache {
+        DISALLOW_ALLOCATION();
+    public:
+        RawPtrWillBeMember<ScopedStyleResolver> scopedResolver;
+        RawPtrWillBeMember<const ContainerNode> nodeForScopedStyles;
 
         ScopedStyleCache()
-            : scopedResolver(0)
-            , nodeForScopedStyles(0)
+            : scopedResolver(nullptr)
+            , nodeForScopedStyles(nullptr)
         {
         }
 
         void clear()
         {
-            scopedResolver = 0;
-            nodeForScopedStyles = 0;
+            scopedResolver = nullptr;
+            nodeForScopedStyles = nullptr;
+        }
+
+        void trace(Visitor* visitor)
+        {
+            visitor->trace(scopedResolver);
+            visitor->trace(nodeForScopedStyles);
         }
     };
     ScopedStyleCache m_cache;
 };
 
 inline ScopedStyleResolver* ScopedStyleTree::scopedResolverFor(const Element* element)
 {
     if (!cacheIsValid(element))
         resolveStyleCache(element);
 
     return m_cache.scopedResolver;
 }
 
 } // namespace blink
 
 #endif // ScopedStyleTree_h