| Index: Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| diff --git a/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| index fe0cdba7cea9198e06615357f1ed1a0d008bbeba..5501264ea919e5b8708c8c2d640e4e62905fd642 100644
|
| --- a/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| +++ b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| @@ -1639,7 +1639,7 @@ bool CanvasRenderingContext2D::rectContainsTransformedRect(const FloatRect& rect
|
| return state().m_transform.mapQuad(quad).containsQuad(transformedQuad);
|
| }
|
|
|
| -void CanvasRenderingContext2D::fullCanvasCompositedDraw(const Closure& draw)
|
| +void CanvasRenderingContext2D::fullCanvasCompositedDraw(PassOwnPtr<Closure> draw)
|
| {
|
| ASSERT(isFullCanvasCompositeMode(state().m_globalComposite));
|
|
|
| @@ -1652,7 +1652,7 @@ void CanvasRenderingContext2D::fullCanvasCompositedDraw(const Closure& draw)
|
| c->beginLayer(1, state().m_globalComposite);
|
| c->setCompositeOperation(CompositeSourceOver);
|
| applyShadow(DrawShadowOnly);
|
| - draw();
|
| + (*draw)();
|
| c->setCompositeOperation(previousOperator);
|
| c->endLayer();
|
| }
|
| @@ -1660,7 +1660,7 @@ void CanvasRenderingContext2D::fullCanvasCompositedDraw(const Closure& draw)
|
| c->beginLayer(1, state().m_globalComposite);
|
| c->clearShadow();
|
| c->setCompositeOperation(CompositeSourceOver);
|
| - draw();
|
| + (*draw)();
|
| c->setCompositeOperation(previousOperator);
|
| c->endLayer();
|
| applyShadow(DrawShadowAndForeground); // go back to normal shadows mode
|
|
|