Remove more oilpan.

I also unraveled lots of transitive deps from Handle.h

R=ojan@chromium.org

Review URL: https://codereview.chromium.org/709203002

engine/core/animation/ActiveAnimations.h

@@ -46,7 +46,7 @@ class Element;
 
 typedef HashCountedSet<RawPtr<AnimationPlayer> > AnimationPlayerCountedSet;
 
-class ActiveAnimations : public DummyBase<ActiveAnimations> {
+class ActiveAnimations {
     WTF_MAKE_NONCOPYABLE(ActiveAnimations);
 public:
     ActiveAnimations()

engine/core/animation/AnimationNode.h

@@ -71,7 +71,7 @@ public:
         PhaseNone,
     };
 
-    class EventDelegate : public DummyBase<EventDelegate> {
+    class EventDelegate {
     public:
         virtual ~EventDelegate() { }
         virtual void onEventCondition(const AnimationNode*) = 0;

engine/core/animation/AnimationPlayer.h

@@ -46,7 +46,6 @@ class AnimationPlayer final : public RefCounted<AnimationPlayer>
     , public EventTargetWithInlineData {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_EVENT_TARGET(AnimationPlayer);
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(AnimationPlayer);
 public:
     enum AnimationPlayState {
         Idle,

engine/core/animation/AnimationTimeline.h

@@ -50,7 +50,7 @@ class AnimationNode;
 class AnimationTimeline : public RefCounted<AnimationTimeline>, public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
-    class PlatformTiming : public DummyBase<PlatformTiming> {
+    class PlatformTiming {
 
     public:
         // Calls AnimationTimeline's wake() method after duration seconds.

engine/core/animation/InterpolableValue.h

@@ -12,7 +12,7 @@
 
 namespace blink {
 
-class InterpolableValue : public DummyBase<InterpolableValue> {
+class InterpolableValue {
     DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(InterpolableValue);
 public:
     virtual bool isNumber() const { return false; }

engine/core/animation/InterpolationEffect.h

@@ -30,7 +30,7 @@ private:
     {
     }
 
-    class InterpolationRecord : public DummyBase<InterpolationRecord> {
+    class InterpolationRecord {
     public:
         RefPtr<Interpolation> m_interpolation;
         RefPtr<TimingFunction> m_easing;

engine/core/animation/Keyframe.h

@@ -50,7 +50,7 @@ public:
 
     virtual void trace(Visitor*) { }
 
-    class PropertySpecificKeyframe : public DummyBase<PropertySpecificKeyframe> {
+    class PropertySpecificKeyframe {
     public:
         virtual ~PropertySpecificKeyframe() { }
         double offset() const { return m_offset; }

engine/core/animation/KeyframeEffectModel.h

@@ -55,7 +55,7 @@ public:
     // FIXME: Implement accumulation.
 
     typedef Vector<OwnPtr<Keyframe::PropertySpecificKeyframe> > PropertySpecificKeyframeVector;
-    class PropertySpecificKeyframeGroup : public DummyBase<PropertySpecificKeyframeGroup> {
+    class PropertySpecificKeyframeGroup {
     public:
         void appendKeyframe(PassOwnPtr<Keyframe::PropertySpecificKeyframe>);
         const PropertySpecificKeyframeVector& keyframes() const { return m_keyframes; }

engine/core/animation/SampledEffect.h

@@ -13,7 +13,7 @@
 
 namespace blink {
 
-class SampledEffect : public DummyBase<SampledEffect> {
+class SampledEffect {
 public:
     static PassOwnPtr<SampledEffect> create(Animation* animation, PassOwnPtr<Vector<RefPtr<Interpolation> > > interpolations)
     {

engine/core/animation/css/CSSAnimations.h

@@ -52,7 +52,7 @@ class StyleRuleKeyframes;
 
 // This class stores the CSS Animations/Transitions information we use during a style recalc.
 // This includes updates to animations/transitions as well as the Interpolations to be applied.
-class CSSAnimationUpdate final : public DummyBase<CSSAnimationUpdate> {
+class CSSAnimationUpdate final {
 public:
     void startAnimation(AtomicString& animationName, PassRefPtr<InertAnimation> animation)
     {

engine/core/animation/css/CSSTimingData.h

@@ -13,7 +13,7 @@ namespace blink {
 
 struct Timing;
 
-class CSSTimingData : public DummyBase<CSSTimingData> {
+class CSSTimingData {
 public:
     ~CSSTimingData() { }
 

engine/core/css/CSSCalculationValue.cpp

@@ -182,7 +182,7 @@ double CSSCalcValue::computeLengthPx(const CSSToLengthConversionData& conversion
 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CSSCalcExpressionNode)
 
 class CSSCalcPrimitiveValue final : public CSSCalcExpressionNode {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
 
     static PassRefPtr<CSSCalcPrimitiveValue> create(PassRefPtr<CSSPrimitiveValue> value, bool isInteger)

engine/core/css/CSSCanvasValue.h

@@ -63,8 +63,7 @@ private:
 
     // NOTE: We put the CanvasObserver in a member instead of inheriting from it
     // to avoid adding a vptr to CSSCanvasValue.
-    class CanvasObserverProxy final : public DummyBase<CanvasObserverProxy>, public CanvasObserver {
-        WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(CanvasObserverProxy);
+    class CanvasObserverProxy final : public CanvasObserver {
     public:
         explicit CanvasObserverProxy(CSSCanvasValue* ownerValue) : m_ownerValue(ownerValue) { }
 

engine/core/css/CSSDefaultStyleSheets.cpp

@@ -83,16 +83,4 @@ CSSDefaultStyleSheets::CSSDefaultStyleSheets()
     m_defaultViewportStyle->addRulesFromSheet(viewportStyleSheet(), screenEval());
 }
 
-void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(Element* element, bool& changedDefaultStyle)
-{
-}
-
-void CSSDefaultStyleSheets::trace(Visitor* visitor)
-{
-    visitor->trace(m_defaultStyle);
-    visitor->trace(m_defaultViewportStyle);
-    visitor->trace(m_defaultStyleSheet);
-    visitor->trace(m_viewportStyleSheet);
-}
-
 } // namespace blink

engine/core/css/CSSDefaultStyleSheets.h

@@ -23,7 +23,8 @@
 #ifndef CSSDefaultStyleSheets_h
 #define CSSDefaultStyleSheets_h
 
-#include "platform/heap/Handle.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/RefPtr.h"
 
 namespace blink {
 
@@ -31,20 +32,16 @@ class Element;
 class RuleSet;
 class StyleSheetContents;
 
-class CSSDefaultStyleSheets : public DummyBase<CSSDefaultStyleSheets> {
+class CSSDefaultStyleSheets {
 public:
     static CSSDefaultStyleSheets& instance();
 
-    void ensureDefaultStyleSheetsForElement(Element*, bool& changedDefaultStyle);
-
     RuleSet* defaultStyle() { return m_defaultStyle.get(); }
     RuleSet* defaultViewportStyle() { return m_defaultViewportStyle.get(); }
 
     StyleSheetContents* defaultStyleSheet() { return m_defaultStyleSheet.get(); }
     StyleSheetContents* viewportStyleSheet() { return m_viewportStyleSheet.get(); }
 
-    void trace(Visitor*);
-
 private:
     CSSDefaultStyleSheets();
 

engine/core/css/CSSFontFace.h

@@ -43,7 +43,7 @@ class RemoteFontFaceSource;
 class SimpleFontData;
 class StyleRuleFontFace;
 
-class CSSFontFace final : public DummyBase<CSSFontFace> {
+class CSSFontFace final {
 public:
     struct UnicodeRange;
     class UnicodeRangeSet;

engine/core/css/CSSFontFaceSource.h

@@ -36,7 +36,7 @@ class CSSFontFace;
 class FontDescription;
 class SimpleFontData;
 
-class CSSFontFaceSource : public DummyBase<CSSFontFaceSource> {
+class CSSFontFaceSource {
 public:
     virtual ~CSSFontFaceSource();
 

engine/core/css/CSSFontSelectorClient.h

@@ -38,7 +38,7 @@ namespace blink {
 class CSSFontSelector;
 class Visitor;
 
-class CSSFontSelectorClient : public DummyBase<CSSFontSelectorClient> {
+class CSSFontSelectorClient {
 public:
     virtual ~CSSFontSelectorClient() { }
 

engine/core/css/CSSKeyframeRule.h

@@ -38,7 +38,7 @@ class StylePropertySet;
 class StyleRuleCSSStyleDeclaration;
 
 class StyleKeyframe final : public RefCounted<StyleKeyframe> {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassRefPtr<StyleKeyframe> create()
     {

engine/core/css/CSSRuleList.h

@@ -23,7 +23,7 @@
 #define CSSRuleList_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
-#include "platform/heap/Handle.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
@@ -33,9 +33,9 @@ namespace blink {
 class CSSRule;
 class CSSStyleSheet;
 
-class CSSRuleList : public DummyBase<CSSRuleList>, public ScriptWrappable {
+class CSSRuleList : public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
     WTF_MAKE_NONCOPYABLE(CSSRuleList);
 public:
     virtual ~CSSRuleList();

engine/core/css/CSSStyleDeclaration.h

@@ -35,9 +35,9 @@ class CSSValue;
 class ExceptionState;
 class MutableStylePropertySet;
 
-class CSSStyleDeclaration : public DummyBase<CSSStyleDeclaration>, public ScriptWrappable {
+class CSSStyleDeclaration : public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
-    WTF_MAKE_NONCOPYABLE(CSSStyleDeclaration); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_NONCOPYABLE(CSSStyleDeclaration); WTF_MAKE_FAST_ALLOCATED;
 public:
     virtual ~CSSStyleDeclaration() { }
 

engine/core/css/CSSValuePool.h

@@ -39,8 +39,8 @@ namespace blink {
 
 class CSSValueList;
 
-class CSSValuePool :  public DummyBase<CSSValuePool> {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class CSSValuePool {
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     PassRefPtr<CSSValueList> createFontFaceValue(const AtomicString&);
     PassRefPtr<CSSPrimitiveValue> createFontFamilyValue(const String&);

engine/core/css/FontFaceSetForEachCallback.h

@@ -34,7 +34,7 @@ namespace blink {
 class FontFace;
 class FontFaceSet;
 
-class FontFaceSetForEachCallback : public DummyBase<FontFaceSetForEachCallback> {
+class FontFaceSetForEachCallback {
 public:
     virtual ~FontFaceSetForEachCallback() { }
     virtual void trace(Visitor*) { }

engine/core/css/MediaQuery.h

@@ -40,8 +40,8 @@ class MediaQueryExp;
 
 typedef Vector<OwnPtr<MediaQueryExp> > ExpressionHeapVector;
 
-class MediaQuery : public DummyBase<MediaQuery> {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class MediaQuery {
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     enum Restrictor {
         Only, Not, None

engine/core/css/MediaQueryExp.h

@@ -76,8 +76,8 @@ struct MediaQueryExpValue {
     }
 };
 
-class MediaQueryExp  : public DummyBase<MediaQueryExp> {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class MediaQueryExp  {
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<MediaQueryExp> createIfValid(const String& mediaFeature, CSSParserValueList*);
     ~MediaQueryExp();

engine/core/css/MediaQueryList.h

@@ -47,7 +47,6 @@ class MediaQuerySet;
 class MediaQueryList final : public RefCounted<MediaQueryList>, public EventTargetWithInlineData, public ActiveDOMObject {
     DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCounted<MediaQueryList>);
     DEFINE_WRAPPERTYPEINFO();
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaQueryList);
 public:
     static PassRefPtr<MediaQueryList> create(ExecutionContext*, PassRefPtr<MediaQueryMatcher>, PassRefPtr<MediaQuerySet>);
     virtual ~MediaQueryList();

engine/core/css/RuleSet.h

@@ -77,9 +77,9 @@ struct SameSizeAsRuleData {
 
 COMPILE_ASSERT(sizeof(RuleData) == sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
 
-class RuleSet : public DummyBase<RuleSet> {
+class RuleSet {
     WTF_MAKE_NONCOPYABLE(RuleSet);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<RuleSet> create() { return adoptPtr(new RuleSet); }
 
@@ -132,7 +132,7 @@ private:
     void compactRules();
     static void compactPendingRules(PendingRuleMap&, CompactRuleMap&);
 
-    class PendingRuleMaps : public DummyBase<PendingRuleMaps> {
+    class PendingRuleMaps {
     public:
         static PassOwnPtr<PendingRuleMaps> create() { return adoptPtr(new PendingRuleMaps); }
 

engine/core/css/StyleRule.h

@@ -36,7 +36,7 @@ class MutableStylePropertySet;
 class StylePropertySet;
 
 class StyleRuleBase : public RefCounted<StyleRuleBase> {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     enum Type {
         Unknown, // Not used.
@@ -91,7 +91,7 @@ private:
 };
 
 class StyleRule : public StyleRuleBase {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassRefPtr<StyleRule> create() { return adoptRef(new StyleRule()); }
 

engine/core/css/invalidation/StyleInvalidator.h

@@ -6,6 +6,8 @@
 #define StyleInvalidator_h
 
 #include "platform/heap/Handle.h"
+#include "wtf/HashMap.h"
+#include "wtf/Vector.h"
 
 namespace blink {
 

engine/core/css/resolver/MatchedPropertiesCache.h

@@ -36,7 +36,7 @@ namespace blink {
 class RenderStyle;
 class StyleResolverState;
 
-class CachedMatchedProperties final : public DummyBase<CachedMatchedProperties> {
+class CachedMatchedProperties final {
 
 public:
     Vector<MatchedProperties> matchedProperties;

engine/core/css/resolver/MediaQueryResult.h

@@ -30,7 +30,7 @@
 namespace blink {
 
 class MediaQueryResult : public RefCounted<MediaQueryResult> {
-    WTF_MAKE_NONCOPYABLE(MediaQueryResult); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_NONCOPYABLE(MediaQueryResult); WTF_MAKE_FAST_ALLOCATED;
 public:
     MediaQueryResult(const MediaQueryExp& expr, bool result)
         : m_expression(expr)

engine/core/css/resolver/ScopedStyleResolver.h

@@ -42,9 +42,9 @@ class StyleResolver;
 class StyleSheetContents;
 
 // This class selects a RenderStyle for a given element based on a collection of stylesheets.
-class ScopedStyleResolver final : public DummyBase<ScopedStyleResolver> {
+class ScopedStyleResolver final {
     WTF_MAKE_NONCOPYABLE(ScopedStyleResolver);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<ScopedStyleResolver> create(TreeScope& scope)
     {

engine/core/css/resolver/StyleResolver.cpp

@@ -459,11 +459,6 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
 
     state.fontBuilder().initForStyleResolve(state.document(), state.style());
 
-    bool needsCollection = false;
-    CSSDefaultStyleSheets::instance().ensureDefaultStyleSheetsForElement(element, needsCollection);
-    if (needsCollection)
-        collectFeatures();
-
     {
         ElementRuleCollector collector(state.elementContext(), state.style());
 

engine/core/css/resolver/StyleResolver.h

@@ -92,8 +92,8 @@ public:
 };
 
 // This class selects a RenderStyle for a given element based on a collection of stylesheets.
-class StyleResolver final : public DummyBase<StyleResolver> {
-    WTF_MAKE_NONCOPYABLE(StyleResolver); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class StyleResolver final {
+    WTF_MAKE_NONCOPYABLE(StyleResolver); WTF_MAKE_FAST_ALLOCATED;
 public:
     explicit StyleResolver(Document&);
     virtual ~StyleResolver();

engine/core/dom/DOMSettableTokenList.h

@@ -42,7 +42,7 @@ class DOMSettableTokenList final
 #endif
     {
     DEFINE_WRAPPERTYPEINFO();
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassRefPtr<DOMSettableTokenList> create()
     {

engine/core/dom/DOMTokenList.h

@@ -35,9 +35,9 @@ namespace blink {
 class Element;
 class ExceptionState;
 
-class DOMTokenList : public DummyBase<DOMTokenList>, public ScriptWrappable {
+class DOMTokenList : public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
     WTF_MAKE_NONCOPYABLE(DOMTokenList);
 public:
     DOMTokenList()

engine/core/dom/Document.h

@@ -145,7 +145,7 @@ typedef unsigned char DocumentClassFlags;
 
 class Document;
 
-class DocumentVisibilityObserver : public DummyBase<void> {
+class DocumentVisibilityObserver {
 public:
     DocumentVisibilityObserver(Document&);
     virtual ~DocumentVisibilityObserver();
@@ -167,7 +167,6 @@ private:
 class Document : public ContainerNode, public TreeScope, public ExecutionContext, public ExecutionContextClient
     , public DocumentSupplementable, public LifecycleContext<Document>, public ResourceClient {
     DEFINE_WRAPPERTYPEINFO();
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Document);
 public:
     static PassRefPtr<Document> create(const DocumentInit& initializer = DocumentInit())
     {

engine/core/dom/DocumentMarker.h

@@ -35,7 +35,7 @@ class DocumentMarkerDetails;
 // It optionally includes a description that could be displayed in the user interface.
 // It also optionally includes a flag specifying whether the match is active, which is ignored
 // for all types other than type TextMatch.
-class DocumentMarker : public DummyBase<DocumentMarker> {
+class DocumentMarker {
 public:
     enum MarkerTypeIndex {
         SpellingMarkerIndex = 0,

engine/core/dom/DocumentMarkerController.h

@@ -51,8 +51,8 @@ private:
     Vector<String> m_words;
 };
 
-class DocumentMarkerController final : public DummyBase<DocumentMarkerController> {
-    WTF_MAKE_NONCOPYABLE(DocumentMarkerController); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class DocumentMarkerController final {
+    WTF_MAKE_NONCOPYABLE(DocumentMarkerController); WTF_MAKE_FAST_ALLOCATED;
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DocumentMarkerController);
 public:
 

engine/core/dom/DocumentParser.h

@@ -86,7 +86,7 @@ private:
 
     // Every DocumentParser needs a pointer back to the document.
     // m_document will be 0 after the parser is stopped.
-    RawPtr<Document> m_document;
+    Document* m_document;
 };
 
 } // namespace blink

engine/core/dom/DocumentStyleSheetCollection.h

@@ -38,7 +38,7 @@ class TreeScope;
 
 class DocumentStyleSheetCollection final : public TreeScopeStyleSheetCollection {
     WTF_MAKE_NONCOPYABLE(DocumentStyleSheetCollection);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<DocumentStyleSheetCollection> create(TreeScope& treeScope)
     {

engine/core/dom/DocumentTest.cpp

@@ -56,10 +56,7 @@ void DocumentTest::SetUp()
     m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
 }
 
-class MockDocumentVisibilityObserver
-    : public DummyBase<MockDocumentVisibilityObserver>
-    , public DocumentVisibilityObserver {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MockDocumentVisibilityObserver);
+class MockDocumentVisibilityObserver : public DocumentVisibilityObserver {
 public:
     static PassOwnPtr<MockDocumentVisibilityObserver> create(Document& document)
     {

engine/core/dom/ElementData.h

@@ -47,7 +47,7 @@ class UniqueElementData;
 // ElementData represents very common, but not necessarily unique to an element,
 // data such as attributes, inline style, and parsed class names and ids.
 class ElementData : public RefCounted<ElementData> {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     // Override RefCounted's deref() to ensure operator delete is called on
     // the appropriate subclass type.

engine/core/dom/ElementDataCache.h

@@ -40,7 +40,7 @@ namespace blink {
 class Attribute;
 class ShareableElementData;
 
-class ElementDataCache final : public DummyBase<ElementDataCache>  {
+class ElementDataCache {
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ElementDataCache)
 public:
     static PassOwnPtr<ElementDataCache> create() { return adoptPtr(new ElementDataCache); }

engine/core/dom/ExecutionContext.cpp

@@ -36,7 +36,7 @@
 
 namespace blink {
 
-class ExecutionContext::PendingException : public DummyBase<ExecutionContext::PendingException> {
+class ExecutionContext::PendingException {
     WTF_MAKE_NONCOPYABLE(PendingException);
 public:
     PendingException(const String& errorMessage, int lineNumber, int columnNumber, int scriptId, const String& sourceURL, PassRefPtr<ScriptCallStack> callStack)

engine/core/dom/IncrementLoadEventDelayCount.h

@@ -5,8 +5,8 @@
 #ifndef IncrementLoadEventDelayCount_h
 #define IncrementLoadEventDelayCount_h
 
-#include "platform/heap/Handle.h"
 #include "wtf/Noncopyable.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {

engine/core/dom/MutationObserverInterestGroup.h

@@ -41,7 +41,7 @@
 
 namespace blink {
 
-class MutationObserverInterestGroup final : public DummyBase<MutationObserverInterestGroup> {
+class MutationObserverInterestGroup final {
 public:
     static PassOwnPtr<MutationObserverInterestGroup> createForChildListMutation(Node& target)
     {

engine/core/dom/MutationObserverRegistration.h

@@ -41,7 +41,7 @@ namespace blink {
 
 class QualifiedName;
 
-class MutationObserverRegistration final : public DummyBase<MutationObserverRegistration> {
+class MutationObserverRegistration final {
 public:
     static PassOwnPtr<MutationObserverRegistration> create(MutationObserver&, Node*, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
     ~MutationObserverRegistration();

engine/core/dom/NodeRareData.h

@@ -31,9 +31,9 @@
 
 namespace blink {
 
-class NodeMutationObserverData final : public DummyBase<NodeMutationObserverData> {
+class NodeMutationObserverData final {
     WTF_MAKE_NONCOPYABLE(NodeMutationObserverData);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     Vector<OwnPtr<MutationObserverRegistration> > registry;
     HashSet<RawPtr<MutationObserverRegistration> > transientRegistry;
@@ -55,9 +55,9 @@ private:
     NodeMutationObserverData() { }
 };
 
-class NodeRareData : public DummyBase<NodeRareData>, public NodeRareDataBase {
+class NodeRareData : public NodeRareDataBase {
     WTF_MAKE_NONCOPYABLE(NodeRareData);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static NodeRareData* create(RenderObject* renderer)
     {

engine/core/dom/RequestAnimationFrameCallback.h

@@ -35,7 +35,7 @@
 
 namespace blink {
 
-class RequestAnimationFrameCallback : public DummyBase<RequestAnimationFrameCallback> {
+class RequestAnimationFrameCallback {
 public:
     virtual ~RequestAnimationFrameCallback() { }
     virtual void trace(Visitor*) { }

engine/core/dom/ShadowTreeStyleSheetCollection.h

@@ -38,7 +38,7 @@ class StyleEngine;
 
 class ShadowTreeStyleSheetCollection final : public TreeScopeStyleSheetCollection {
     WTF_MAKE_NONCOPYABLE(ShadowTreeStyleSheetCollection);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     explicit ShadowTreeStyleSheetCollection(ShadowRoot&);
 

engine/core/dom/StyleElement.h

@@ -31,7 +31,7 @@ class Document;
 class Element;
 class TreeScope;
 
-class StyleElement : public DummyBase<void> {
+class StyleElement {
 public:
     StyleElement(Document*, bool createdByParser);
     virtual ~StyleElement();

engine/core/dom/StyleEngine.h

@@ -53,7 +53,7 @@ class StyleSheet;
 class StyleSheetContents;
 
 class StyleEngine final : public CSSFontSelectorClient  {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
 
     class IgnoringPendingStylesheet : public TemporaryChange<bool> {

engine/core/dom/StyleSheetCollection.h

@@ -38,9 +38,9 @@ namespace blink {
 class CSSStyleSheet;
 class StyleSheet;
 
-class StyleSheetCollection : public DummyBase<StyleSheetCollection> {
+class StyleSheetCollection {
     WTF_MAKE_NONCOPYABLE(StyleSheetCollection);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     friend class ActiveDocumentStyleSheetCollector;
     friend class ImportedDocumentStyleSheetCollector;

engine/core/dom/TreeScope.h

@@ -44,7 +44,7 @@ class Node;
 // A class which inherits both Node and TreeScope must call clearRareData() in its destructor
 // so that the Node destructor no longer does problematic NodeList cache manipulation in
 // the destructor.
-class TreeScope : public DummyBase<void> {
+class TreeScope {
 public:
     TreeScope* parentTreeScope() const { return m_parentTreeScope; }
 

engine/core/dom/TreeShared.h

@@ -33,7 +33,7 @@ template<typename NodeType> class TreeShared;
 template<typename NodeType> void adopted(TreeShared<NodeType>*);
 #endif
 
-template<typename NodeType> class TreeShared : public DummyBase<NodeType> {
+template<typename NodeType> class TreeShared {
     WTF_MAKE_NONCOPYABLE(TreeShared);
 protected:
     TreeShared()

engine/core/dom/custom/CustomElementCallbackQueue.h

@@ -44,7 +44,7 @@ namespace blink {
 
 // FIXME: Rename this because it contains resolution and upgrade as
 // well as callbacks.
-class CustomElementCallbackQueue : public DummyBase<CustomElementCallbackQueue> {
+class CustomElementCallbackQueue {
     WTF_MAKE_NONCOPYABLE(CustomElementCallbackQueue);
 public:
     static PassOwnPtr<CustomElementCallbackQueue> create(PassRefPtr<Element>);

engine/core/dom/custom/CustomElementMicrotaskDispatcher.h

@@ -18,7 +18,7 @@ class CustomElementMicrotaskStep;
 class Document;
 class HTMLImportLoader;
 
-class CustomElementMicrotaskDispatcher final : public DummyBase<CustomElementMicrotaskDispatcher> {
+class CustomElementMicrotaskDispatcher final {
     WTF_MAKE_NONCOPYABLE(CustomElementMicrotaskDispatcher);
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CustomElementMicrotaskDispatcher);
 public:

engine/core/dom/custom/CustomElementMicrotaskRunQueue.cpp

@@ -15,8 +15,6 @@
 
 namespace blink {
 
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CustomElementMicrotaskRunQueue)
-
 CustomElementMicrotaskRunQueue::CustomElementMicrotaskRunQueue()
     : m_syncQueue(CustomElementSyncMicrotaskQueue::create())
     , m_asyncQueue(CustomElementAsyncImportMicrotaskQueue::create())
@@ -25,6 +23,10 @@ CustomElementMicrotaskRunQueue::CustomElementMicrotaskRunQueue()
 {
 }
 
+CustomElementMicrotaskRunQueue::~CustomElementMicrotaskRunQueue()
+{
+}
+
 void CustomElementMicrotaskRunQueue::enqueue(HTMLImportLoader* parentLoader, PassOwnPtr<CustomElementMicrotaskStep> step, bool importIsSync)
 {
     if (importIsSync) {
@@ -47,12 +49,6 @@ void CustomElementMicrotaskRunQueue::requestDispatchIfNeeded()
     m_dispatchIsPending = true;
 }
 
-void CustomElementMicrotaskRunQueue::trace(Visitor* visitor)
-{
-    visitor->trace(m_syncQueue);
-    visitor->trace(m_asyncQueue);
-}
-
 void CustomElementMicrotaskRunQueue::dispatch()
 {
     m_dispatchIsPending = false;

engine/core/dom/custom/CustomElementMicrotaskRunQueue.h

@@ -6,8 +6,9 @@
 #define CustomElementMicrotaskRunQueue_h
 
 #include "base/memory/weak_ptr.h"
-#include "platform/heap/Handle.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
+#include "wtf/RefPtr.h"
 
 namespace blink {
 
@@ -17,16 +18,14 @@ class CustomElementMicrotaskStep;
 class HTMLImportLoader;
 
 class CustomElementMicrotaskRunQueue : public RefCounted<CustomElementMicrotaskRunQueue> {
-    DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CustomElementMicrotaskRunQueue)
 public:
     static PassRefPtr<CustomElementMicrotaskRunQueue> create() { return adoptRef(new CustomElementMicrotaskRunQueue()); }
+    ~CustomElementMicrotaskRunQueue();
 
     void enqueue(HTMLImportLoader* parentLoader, PassOwnPtr<CustomElementMicrotaskStep>, bool importIsSync);
     void requestDispatchIfNeeded();
     bool isEmpty() const;
 
-    void trace(Visitor*);
-
 private:
     CustomElementMicrotaskRunQueue();
 

engine/core/dom/custom/CustomElementMicrotaskStep.h

@@ -36,7 +36,7 @@
 
 namespace blink {
 
-class CustomElementMicrotaskStep : public DummyBase<CustomElementMicrotaskStep> {
+class CustomElementMicrotaskStep {
     WTF_MAKE_NONCOPYABLE(CustomElementMicrotaskStep);
 public:
     CustomElementMicrotaskStep() { }

engine/core/dom/custom/CustomElementObserver.h

@@ -38,7 +38,7 @@ namespace blink {
 
 class Element;
 
-class CustomElementObserver : public DummyBase<CustomElementObserver> {
+class CustomElementObserver {
 public:
     virtual ~CustomElementObserver() { }
 

engine/core/dom/custom/CustomElementScheduler.h

@@ -49,7 +49,7 @@ class Document;
 class Element;
 class HTMLImportChild;
 
-class CustomElementScheduler final : public DummyBase<CustomElementScheduler> {
+class CustomElementScheduler final {
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CustomElementScheduler);
 public:
 

engine/core/dom/shadow/ElementShadow.h

@@ -38,9 +38,9 @@
 
 namespace blink {
 
-class ElementShadow final : public DummyBase<ElementShadow> {
+class ElementShadow final {
     WTF_MAKE_NONCOPYABLE(ElementShadow);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<ElementShadow> create();
     ~ElementShadow();

engine/core/dom/shadow/ShadowRoot.h

@@ -45,7 +45,6 @@ class StyleSheetList;
 
 class ShadowRoot final : public DocumentFragment, public TreeScope, public DoublyLinkedListNode<ShadowRoot> {
     DEFINE_WRAPPERTYPEINFO();
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ShadowRoot);
     friend class WTF::DoublyLinkedListNode<ShadowRoot>;
 public:
 

engine/core/dom/shadow/ShadowRootRareData.h

@@ -37,7 +37,7 @@
 
 namespace blink {
 
-class ShadowRootRareData : public DummyBase<ShadowRootRareData> {
+class ShadowRootRareData {
 public:
     ShadowRootRareData()
         : m_descendantShadowElementCount(0)

engine/core/editing/Caret.h

@@ -41,7 +41,7 @@ class RenderView;
 
 class CaretBase {
     WTF_MAKE_NONCOPYABLE(CaretBase);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 protected:
     enum CaretVisibility { Visible, Hidden };
     explicit CaretBase(CaretVisibility = Hidden);
@@ -75,9 +75,9 @@ private:
     CaretVisibility m_caretVisibility;
 };
 
-class DragCaretController final : public DummyBase<DragCaretController>, private CaretBase {
+class DragCaretController final : private CaretBase {
     WTF_MAKE_NONCOPYABLE(DragCaretController);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<DragCaretController> create();
 

engine/core/editing/EditingStyle.cpp

@@ -150,8 +150,8 @@ static bool hasTransparentBackgroundColor(CSSStyleDeclaration*);
 static bool hasTransparentBackgroundColor(StylePropertySet*);
 static PassRefPtr<CSSValue> backgroundColorInEffect(Node*);
 
-class HTMLElementEquivalent : public DummyBase<HTMLElementEquivalent> {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class HTMLElementEquivalent {
+    WTF_MAKE_FAST_ALLOCATED;
     DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(HTMLElementEquivalent);
 public:
     static PassOwnPtr<HTMLElementEquivalent> create(CSSPropertyID propertyID, CSSValueID primitiveValue, const HTMLQualifiedName& tagName)

engine/core/editing/Editor.h

@@ -58,7 +58,7 @@ class UndoStack;
 enum EditorCommandSource { CommandFromMenuOrKeyBinding, CommandFromDOM, CommandFromDOMWithUserInterface };
 enum EditorParagraphSeparator { EditorParagraphSeparatorIsDiv, EditorParagraphSeparatorIsP };
 
-class Editor final : public DummyBase<Editor> {
+class Editor final {
     WTF_MAKE_NONCOPYABLE(Editor);
 public:
     static PassOwnPtr<Editor> create(LocalFrame&);

engine/core/editing/FrameSelection.h

@@ -56,10 +56,9 @@ enum RevealExtentOption {
     DoNotRevealExtent
 };
 
-class FrameSelection final : public DummyBase<FrameSelection>, public VisibleSelection::ChangeObserver, private CaretBase {
+class FrameSelection final : public VisibleSelection::ChangeObserver, private CaretBase {
     WTF_MAKE_NONCOPYABLE(FrameSelection);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FrameSelection);
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<FrameSelection> create(LocalFrame* frame = 0)
     {

engine/core/editing/UndoStack.h

@@ -40,7 +40,7 @@ namespace blink {
 class LocalFrame;
 class UndoStep;
 
-class UndoStack final : public DummyBase<UndoStack> {
+class UndoStack final {
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(UndoStack)
 public:
     static PassOwnPtr<UndoStack> create();

engine/core/editing/VisibleSelection.h

@@ -117,7 +117,7 @@ public:
     // or end is moved to a different position.
     //
     // Objects implementing |ChangeObserver| interface must outlive the VisibleSelection object.
-    class ChangeObserver : public DummyBase<void> {
+    class ChangeObserver {
         WTF_MAKE_NONCOPYABLE(ChangeObserver);
     public:
         ChangeObserver();

engine/core/events/DOMWindowEventQueue.cpp

@@ -33,7 +33,7 @@
 
 namespace blink {
 
-class DOMWindowEventQueueTimer : public DummyBase<DOMWindowEventQueueTimer>, public SuspendableTimer {
+class DOMWindowEventQueueTimer : public SuspendableTimer {
     WTF_MAKE_NONCOPYABLE(DOMWindowEventQueueTimer);
 public:
     DOMWindowEventQueueTimer(DOMWindowEventQueue* eventQueue, ExecutionContext* context)

engine/core/events/EventFactory.h

@@ -26,7 +26,7 @@
 #ifndef EventFactory_h
 #define EventFactory_h
 
-#include "platform/heap/Handle.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/AtomicString.h"
 

engine/core/events/EventPath.h

@@ -42,7 +42,7 @@ class TouchEvent;
 class TouchList;
 class TreeScope;
 
-class EventPath final : public DummyBase<EventPath> {
+class EventPath final {
 public:
     explicit EventPath(Event*);
     explicit EventPath(Node*);

engine/core/events/EventQueue.h

@@ -36,7 +36,7 @@ namespace blink {
 
 class Event;
 
-class EventQueue : public DummyBase<EventQueue> {
+class EventQueue {
 public:
     virtual ~EventQueue() { }
     virtual void trace(Visitor*) { }

engine/core/events/EventTarget.h

@@ -75,10 +75,7 @@ public:
 //   EventTarget directly).
 // - Figure out if you now need to inherit from ActiveDOMObject as well.
 // - In your class declaration, you will typically use
-//   REFCOUNTED_EVENT_TARGET(YourClassName) and
-//   WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(YourClassName). Make sure to include
-//   this header file in your .h file, or you will get very strange compiler
-//   errors.
+//   REFCOUNTED_EVENT_TARGET(YourClassName).
 // - Call ScriptWrappable::init(this) in your constructor, unless you are already
 //   doing so.
 // - Override EventTarget::interfaceName() and executionContext(). The former
@@ -89,7 +86,7 @@ public:
 //
 // Optionally, add a FooEvent.idl class, but that's outside the scope of this
 // comment (and much more straightforward).
-class EventTarget : public DummyBase<void>, public ScriptWrappable {
+class EventTarget : public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
 #if !ENABLE(OILPAN)

engine/core/events/GenericEventQueue.h

@@ -36,7 +36,7 @@
 namespace blink {
 
 class GenericEventQueue final : public EventQueue {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<GenericEventQueue> create(EventTarget*);
     virtual ~GenericEventQueue();

engine/core/fetch/MemoryCache.h

@@ -74,7 +74,7 @@ enum UpdateReason {
 // MemoryCacheEntry class is used only in MemoryCache class, but we don't make
 // MemoryCacheEntry class an inner class of MemoryCache because of dependency
 // from MemoryCacheLRUList.
-class MemoryCacheEntry final : public DummyBase<MemoryCacheEntry> {
+class MemoryCacheEntry final {
 public:
     static PassOwnPtr<MemoryCacheEntry> create(Resource* resource) { return adoptPtr(new MemoryCacheEntry(resource)); }
     void trace(Visitor*);
@@ -124,8 +124,8 @@ WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::MemoryCacheLRUList);
 
 namespace blink {
 
-class MemoryCache final : public DummyBase<MemoryCache> {
-    WTF_MAKE_NONCOPYABLE(MemoryCache); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class MemoryCache final {
+    WTF_MAKE_NONCOPYABLE(MemoryCache); WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<MemoryCache> create();
     ~MemoryCache();

engine/core/fetch/Resource.h

@@ -51,8 +51,8 @@ class SharedBuffer;
 // A resource that is held in the cache. Classes who want to use this object should derive
 // from ResourceClient, to get the function calls in case the requested data has arrived.
 // This class also does the actual communication with the loader to obtain the resource from the network.
-class Resource : public DummyBase<Resource> {
-    WTF_MAKE_NONCOPYABLE(Resource); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class Resource {
+    WTF_MAKE_NONCOPYABLE(Resource); WTF_MAKE_FAST_ALLOCATED;
     friend class InspectorResource;
 
 public:

engine/core/fetch/ResourceFetcher.h

@@ -62,8 +62,7 @@ class ResourceLoaderSet;
 // are initialized without a LocalFrame), so a Document can keep a ResourceFetcher
 // alive past detach if scripts still reference the Document.
 class ResourceFetcher final : public RefCounted<ResourceFetcher>, public ResourceLoaderHost {
-    WTF_MAKE_NONCOPYABLE(ResourceFetcher); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ResourceFetcher);
+    WTF_MAKE_NONCOPYABLE(ResourceFetcher); WTF_MAKE_FAST_ALLOCATED;
 friend class ImageLoader;
 friend class ResourceCacheValidationSuppressor;
 

engine/core/fetch/ResourceLoaderHost.h

@@ -45,7 +45,7 @@ class ResourceResponse;
 
 struct FetchInitiatorInfo;
 
-class ResourceLoaderHost : public DummyBase<void> {
+class ResourceLoaderHost {
 public:
     virtual void incrementRequestCount(const Resource*) = 0;
     virtual void decrementRequestCount(const Resource*) = 0;

engine/core/fetch/ResourceLoaderSet.h

@@ -36,7 +36,7 @@
 
 namespace blink {
 
-class ResourceLoaderSet final : public DummyBase<ResourceLoaderSet> {
+class ResourceLoaderSet final {
 public:
     typedef HashSet<RefPtr<ResourceLoader> > SetType;
 

engine/core/frame/EventHandlerRegistry.h

@@ -7,6 +7,7 @@
 
 #include "core/frame/FrameHost.h"
 #include "wtf/HashCountedSet.h"
+#include "wtf/text/AtomicString.h"
 
 namespace blink {
 
@@ -18,7 +19,7 @@ typedef HashCountedSet<EventTarget*> EventTargetSet;
 // Registry for keeping track of event handlers. Note that only handlers on
 // documents that can be rendered or can receive input (i.e., are attached to a
 // FrameHost) are registered here.
-class EventHandlerRegistry final : public DummyBase<EventHandlerRegistry> {
+class EventHandlerRegistry final {
 public:
     explicit EventHandlerRegistry(FrameHost&);
     virtual ~EventHandlerRegistry();

engine/core/frame/Frame.h

@@ -28,9 +28,9 @@
 #ifndef Frame_h
 #define Frame_h
 
-#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/RefCounted.h"
+#include "wtf/RefPtr.h"
 
 namespace blink {
 class WebLayer;

engine/core/frame/FrameConsole.h

@@ -46,7 +46,7 @@ class ScriptCallStack;
 
 // FrameConsole takes per-frame console messages and routes them up through the FrameHost to the ChromeClient and Inspector.
 // It's meant as an abstraction around ChromeClient calls and the way that Blink core/ can add messages to the console.
-class FrameConsole final : public DummyBase<FrameConsole> {
+class FrameConsole final {
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(FrameConsole);
 public:
     static PassOwnPtr<FrameConsole> create(LocalFrame& frame)

engine/core/frame/FrameHost.h

@@ -56,8 +56,8 @@ class Visitor;
 // browser-level concept and Blink core/ only knows about its LocalFrame (and FrameHost).
 // Separating Page from the rest of core/ through this indirection
 // allows us to slowly refactor Page without breaking the rest of core.
-class FrameHost final : public DummyBase<FrameHost> {
-    WTF_MAKE_NONCOPYABLE(FrameHost); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+class FrameHost final {
+    WTF_MAKE_NONCOPYABLE(FrameHost); WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<FrameHost> create(Page&, ServiceProvider&);
     ~FrameHost();
@@ -82,7 +82,7 @@ public:
 private:
     FrameHost(Page&, ServiceProvider&);
 
-    RawPtr<Page> m_page;
+    Page* m_page;
     ServiceProvider& m_services;
     const OwnPtr<EventHandlerRegistry> m_eventHandlerRegistry;
 };

engine/core/frame/ImageBitmap.h

@@ -21,7 +21,6 @@ class ImageData;
 
 class ImageBitmap final : public RefCounted<ImageBitmap>, public ScriptWrappable, public ImageLoaderClient, public CanvasImageSource {
     DEFINE_WRAPPERTYPEINFO();
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ImageBitmap);
 public:
     static PassRefPtr<ImageBitmap> create(HTMLImageElement*, const IntRect&);
     static PassRefPtr<ImageBitmap> create(HTMLCanvasElement*, const IntRect&);

engine/core/frame/LocalDOMWindow.h

@@ -83,7 +83,6 @@ enum SetLocationLocking { LockHistoryBasedOnGestureState, LockHistoryAndBackForw
 class LocalDOMWindow final : public RefCounted<LocalDOMWindow>, public EventTargetWithInlineData, public DOMWindowBase64, public FrameDestructionObserver, public Supplementable<LocalDOMWindow>, public LifecycleContext<LocalDOMWindow> {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_EVENT_TARGET(LocalDOMWindow);
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalDOMWindow);
 public:
     static PassRefPtr<LocalDOMWindow> create(LocalFrame& frame)
     {

engine/core/frame/Screen.h

@@ -43,7 +43,6 @@ class LocalFrame;
 
 class Screen final : public RefCounted<Screen>, public ScriptWrappable, public DOMWindowProperty, public Supplementable<Screen> {
     DEFINE_WRAPPERTYPEINFO();
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Screen);
 public:
     static PassRefPtr<Screen> create(LocalFrame* frame)
     {

engine/core/html/HTMLCanvasElement.h

@@ -57,7 +57,7 @@ class ImageBuffer;
 class ImageBufferSurface;
 class IntSize;
 
-class CanvasObserver : public DummyBase<void> {
+class CanvasObserver {
     DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(CanvasObserver);
 public:
     virtual void canvasChanged(HTMLCanvasElement*, const FloatRect& changedRect) = 0;
@@ -69,7 +69,6 @@ public:
 
 class HTMLCanvasElement final : public HTMLElement, public DocumentVisibilityObserver, public CanvasImageSource, public ImageBufferClient {
     DEFINE_WRAPPERTYPEINFO();
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLCanvasElement);
 public:
     DECLARE_NODE_FACTORY(HTMLCanvasElement);
     virtual ~HTMLCanvasElement();

engine/core/html/HTMLStyleElement.h

@@ -35,7 +35,6 @@ typedef EventSender<HTMLStyleElement> StyleEventSender;
 
 class HTMLStyleElement final : public HTMLElement, private StyleElement {
     DEFINE_WRAPPERTYPEINFO();
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLStyleElement);
 public:
     static PassRefPtr<HTMLStyleElement> create(Document&, bool createdByParser);
     virtual ~HTMLStyleElement();

engine/core/html/VoidCallback.h

@@ -30,7 +30,7 @@
 
 namespace blink {
 
-class VoidCallback : public DummyBase<VoidCallback> {
+class VoidCallback {
 public:
     virtual ~VoidCallback() { }
     virtual void trace(Visitor*) { }

engine/core/html/canvas/Canvas2DContextAttributes.h

@@ -30,6 +30,7 @@
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/html/canvas/CanvasContextAttributes.h"
 #include "wtf/PassRefPtr.h"
+#include "wtf/text/WTFString.h"
 
 namespace blink {
 

engine/core/html/canvas/CanvasRenderingContext.h

@@ -41,9 +41,9 @@ class HTMLCanvasElement;
 class KURL;
 class WebGLObject;
 
-class CanvasRenderingContext : public DummyBase<CanvasRenderingContext> {
+class CanvasRenderingContext {
     WTF_MAKE_NONCOPYABLE(CanvasRenderingContext);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     virtual ~CanvasRenderingContext() { }
 

engine/core/html/canvas/HitRegion.h

@@ -57,7 +57,7 @@ private:
     WindRule m_fillRule;
 };
 
-class HitRegionManager final : public DummyBase<HitRegionManager> {
+class HitRegionManager final {
     WTF_MAKE_NONCOPYABLE(HitRegionManager);
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(HitRegionManager)
 public:

engine/core/html/canvas/Path2D.h

@@ -39,7 +39,7 @@ namespace blink {
 
 class Path2D final : public RefCounted<Path2D>, public CanvasPathMethods, public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
     WTF_MAKE_NONCOPYABLE(Path2D);
 public:
     static PassRefPtr<Path2D> create() { return adoptRef(new Path2D); }

engine/core/html/canvas/WebGLContextObject.cpp

@@ -71,10 +71,4 @@ blink::WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() cons
 #endif
 }
 
-void WebGLContextObject::trace(Visitor* visitor)
-{
-    visitor->trace(m_context);
-    WebGLObject::trace(visitor);
-}
-
 }

engine/core/html/canvas/WebGLContextObject.h

@@ -52,8 +52,6 @@ public:
 
     void detachContext();
 
-    virtual void trace(Visitor*) override;
-
 protected:
     explicit WebGLContextObject(WebGLRenderingContextBase*);
 
@@ -65,7 +63,7 @@ protected:
     virtual blink::WebGraphicsContext3D* getAWebGraphicsContext3D() const override final;
 
 private:
-    RawPtr<WebGLRenderingContextBase> m_context;
+    WebGLRenderingContextBase* m_context;
 #if ENABLE(OILPAN)
     RefPtr<WebGLSharedWebGraphicsContext3D> m_sharedWebGraphicsContext3D;
 #endif

engine/core/html/canvas/WebGLExtension.h

@@ -34,7 +34,7 @@
 namespace blink {
 
 class WebGLExtension : public RefCounted<WebGLExtension> {
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     WebGLRenderingContextBase* context() { return m_context; }