Move ScopedStyleResolver and ScopedStyleTree to oilpan's heap

Source/core/css/resolver/ScopedStyleResolver.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 26 matching lines @@
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 class MediaQueryEvaluator;
 class PageRuleCollector;
 class StyleResolver;
 class StyleSheetContents;
 
 // This class selects a RenderStyle for a given element based on a collection of stylesheets.
-class ScopedStyleResolver {
-    WTF_MAKE_NONCOPYABLE(ScopedStyleResolver); WTF_MAKE_FAST_ALLOCATED;
+class ScopedStyleResolver FINAL : public NoBaseWillBeGarbageCollected<ScopedStyleResolver> {
+    WTF_MAKE_NONCOPYABLE(ScopedStyleResolver);
+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
-    static PassOwnPtr<ScopedStyleResolver> create(TreeScope& scope)
+    static PassOwnPtrWillBeRawPtr<ScopedStyleResolver> create(TreeScope& scope)
     {
-        return adoptPtr(new ScopedStyleResolver(scope));
+        return adoptPtrWillBeNoop(new ScopedStyleResolver(scope));
     }
 
     static ContainerNode* scopingNodeFor(Document&, const CSSStyleSheet*);
 
-    const ContainerNode& scopingNode() const { return m_scope.rootNode(); }
-    const TreeScope& treeScope() const { return m_scope; }
+    const ContainerNode& scopingNode() const { return m_scope->rootNode(); }
+    const TreeScope& treeScope() const { return *m_scope; }
     ScopedStyleResolver* parent() const;
 
 public:
     const StyleRuleKeyframes* keyframeStylesForAnimation(const StringImpl* animationName);
     void addKeyframeStyle(PassRefPtrWillBeRawPtr<StyleRuleKeyframes>);
 
     void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRules, bool applyAuthorStyles, CascadeScope, CascadeOrder = ignoreCascadeOrder);
     void matchPageRules(PageRuleCollector&);
     void addRulesFromSheet(CSSStyleSheet*, const MediaQueryEvaluator&, StyleResolver*);
     void collectFeaturesTo(RuleFeatureSet&, HashSet<const StyleSheetContents*>& visitedSharedStyleSheetContents);
     void resetAuthorStyle();
     void collectViewportRulesTo(StyleResolver*) const;
 
+    void trace(Visitor*);
+
 private:
     explicit ScopedStyleResolver(TreeScope& scope)
         : m_scope(scope)
     {
     }
 
-    TreeScope& m_scope;
+    RawPtrWillBeMember<TreeScope> m_scope;
 
-    WillBePersistentHeapVector<RawPtrWillBeMember<CSSStyleSheet> > m_authorStyleSheets;
+    WillBeHeapVector<RawPtrWillBeMember<CSSStyleSheet> > m_authorStyleSheets;
 
-    typedef WillBePersistentHeapHashMap<const StringImpl*, RefPtrWillBeMember<StyleRuleKeyframes> > KeyframesRuleMap;
+    typedef WillBeHeapHashMap<const StringImpl*, RefPtrWillBeMember<StyleRuleKeyframes> > KeyframesRuleMap;
     KeyframesRuleMap m_keyframesRuleMap;
 };
 
 } // namespace blink
 
 #endif // ScopedStyleResolver_h