| Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
|
| diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
|
| index d31e65a207268c5b9346fc84c4302a4dc016afb7..62f9fd8f611352d9adc049d28184ac2142e5f453 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
|
| +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
|
| @@ -70,9 +70,9 @@ public:
|
| Factory() {}
|
| ~Factory() override {}
|
|
|
| - PassOwnPtrWillBeRawPtr<CanvasRenderingContext> create(HTMLCanvasElement* canvas, const CanvasContextCreationAttributes& attrs, Document& document) override
|
| + RawPtr<CanvasRenderingContext> create(HTMLCanvasElement* canvas, const CanvasContextCreationAttributes& attrs, Document& document) override
|
| {
|
| - return adoptPtrWillBeNoop(new CanvasRenderingContext2D(canvas, attrs, document));
|
| + return (new CanvasRenderingContext2D(canvas, attrs, document));
|
| }
|
| CanvasRenderingContext::ContextType contextType() const override { return CanvasRenderingContext::Context2d; }
|
| void onError(HTMLCanvasElement*, const String& error) override { }
|
| @@ -133,8 +133,8 @@ public:
|
| void save();
|
| void restore();
|
|
|
| - PassRefPtrWillBeRawPtr<SVGMatrixTearOff> currentTransform() const;
|
| - void setCurrentTransform(PassRefPtrWillBeRawPtr<SVGMatrixTearOff>);
|
| + RawPtr<SVGMatrixTearOff> currentTransform() const;
|
| + void setCurrentTransform(RawPtr<SVGMatrixTearOff>);
|
|
|
| void scale(double sx, double sy);
|
| void rotate(double angleInRadians);
|
| @@ -304,8 +304,8 @@ private:
|
|
|
| WebLayer* platformLayer() const override;
|
|
|
| - WillBeHeapVector<OwnPtrWillBeMember<CanvasRenderingContext2DState>> m_stateStack;
|
| - PersistentWillBeMember<HitRegionManager> m_hitRegionManager;
|
| + HeapVector<Member<CanvasRenderingContext2DState>> m_stateStack;
|
| + Member<HitRegionManager> m_hitRegionManager;
|
| AntiAliasingMode m_clipAntialiasing;
|
| bool m_hasAlpha;
|
| LostContextMode m_contextLostMode;
|
|
|