[Oilpan]: Move CSSFontSelectorClient to the oilpan heap using transition types.

Source/core/html/canvas/CanvasRenderingContext2D.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Apple 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 97 matching lines @@
 
     String shadowColor() const;
     void setShadowColor(const String&);
 
     float globalAlpha() const;
     void setGlobalAlpha(float);
 
     String globalCompositeOperation() const;
     void setGlobalCompositeOperation(const String&);
 
-    void save() { ++m_stateStack.last().m_unrealizedSaveCount; }
+    void save() { ++m_stateStack.last()->m_unrealizedSaveCount; }
     void restore();
 
     PassRefPtr<SVGMatrixTearOff> currentTransform() const
     {
         return SVGMatrixTearOff::create(state().m_transform);
     }
     void setCurrentTransform(PassRefPtr<SVGMatrixTearOff>, ExceptionState&);
 
     void scale(float sx, float sy);
     void rotate(float angleInRadians);
@@ skipping 98 matching lines @@
 
     bool imageSmoothingEnabled() const;
     void setImageSmoothingEnabled(bool);
 
     PassRefPtr<Canvas2DContextAttributes> getContextAttributes() const;
 
     void drawFocusIfNeeded(Element*);
     bool drawCustomFocusRing(Element*);
 
 private:
     struct State FINAL : CSSFontSelectorClient {

[haraken, 2014/03/25 13:19:30]

Nit: I would change this struct to a class. It looks weird that a struct
inherits from a class.

[wibling-chromium, 2014/03/25 13:27:17]

Done.

         State();
         virtual ~State();
 
         State(const State&);
         State& operator=(const State&);
 
         // CSSFontSelectorClient implementation
         virtual void fontsNeedUpdate(CSSFontSelector*) OVERRIDE;
 
         unsigned m_unrealizedSaveCount;
@@ skipping 11 matching lines @@
         RGBA32 m_shadowColor;
         float m_globalAlpha;
         CompositeOperator m_globalComposite;
         blink::WebBlendMode m_globalBlend;
         AffineTransform m_transform;
         bool m_invertibleCTM;
         Vector<float> m_lineDash;
         float m_lineDashOffset;
         bool m_imageSmoothingEnabled;
 
+        virtual void trace(Visitor*) OVERRIDE { }
+
         // Text state.
         TextAlign m_textAlign;
         TextBaseline m_textBaseline;
 
         String m_unparsedFont;
         Font m_font;
         bool m_realizedFont;
     };
 
     CanvasRenderingContext2D(HTMLCanvasElement*, const Canvas2DContextAttributes* attrs, bool usesCSSCompatibilityParseMode);
 
-    State& modifiableState() { ASSERT(!state().m_unrealizedSaveCount); return m_stateStack.last(); }
-    const State& state() const { return m_stateStack.last(); }
+    State& modifiableState() { ASSERT(!state().m_unrealizedSaveCount); return *m_stateStack.last(); }
+    const State& state() const { return *m_stateStack.last(); }
 
     void applyLineDash() const;
     void setShadow(const FloatSize& offset, float blur, RGBA32 color);
     void applyShadow();
     bool shouldDrawShadows() const;
 
     bool computeDirtyRect(const FloatRect& localBounds, FloatRect*);
     bool computeDirtyRect(const FloatRect& localBounds, const FloatRect& transformedClipBounds, FloatRect*);
     void didDraw(const FloatRect&);
 
@@ skipping 33 matching lines @@
     void drawFocusRing(const Path&);
 
     virtual bool is2d() const OVERRIDE { return true; }
     virtual bool isAccelerated() const OVERRIDE;
     virtual bool hasAlpha() const OVERRIDE { return m_hasAlpha; }
 
     virtual bool isTransformInvertible() const OVERRIDE { return state().m_invertibleCTM; }
 
     virtual blink::WebLayer* platformLayer() const OVERRIDE;
 
-    Vector<State, 1> m_stateStack;
+    // FIXME: Oilpan: Make this a vector of embedded State objects rather than pointers
+    // once we support having vectors with objects using a vtable in oilpan.
+    WillBePersistentHeapVector<OwnPtrWillBeMember<State> > m_stateStack;
     bool m_usesCSSCompatibilityParseMode;
     bool m_hasAlpha;
     MutableStylePropertyMap m_fetchedFonts;
 };
 
 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, context->is2d(), context.is2d());
 
 } // namespace WebCore
 
 #endif