Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Unified Diff: Source/core/html/canvas/CanvasRenderingContext2D.cpp

Issue 705003002: Change the return type of WTF::bind() to |OwnPtr<Function>| (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reflect comments from yhirano Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.h ('k') | Source/core/html/parser/HTMLParserThread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.h ('k') | Source/core/html/parser/HTMLParserThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698