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

Unified Diff: ui/gfx/canvas_skia_mac.mm

Issue 8122013: Allow CanvasSkia to bind to an existing SkCanvas. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 1 more fix Created 9 years, 2 months 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
Index: ui/gfx/canvas_skia_mac.mm
diff --git a/ui/gfx/canvas_skia_mac.mm b/ui/gfx/canvas_skia_mac.mm
index 6d40d0c9d2675bc05dd45b5fe45ffc49f02dca11..a20f92af2e6c7e8c2e42a352a1c1baded852779d 100644
--- a/ui/gfx/canvas_skia_mac.mm
+++ b/ui/gfx/canvas_skia_mac.mm
@@ -15,16 +15,6 @@
namespace gfx {
-CanvasSkia::CanvasSkia(int width, int height, bool is_opaque)
- : skia::PlatformCanvas(width, height, is_opaque) {
-}
-
-CanvasSkia::CanvasSkia() : skia::PlatformCanvas() {
-}
-
-CanvasSkia::~CanvasSkia() {
-}
-
// static
void CanvasSkia::SizeStringInt(const string16& text,
const gfx::Font& font,
@@ -48,7 +38,7 @@ void CanvasSkia::DrawStringInt(const string16& text,
if (!IntersectsClipRectInt(x, y, w, h))
return;
- skia::ScopedPlatformPaint scoped_platform_paint(this);
+ skia::ScopedPlatformPaint scoped_platform_paint(canvas_);
CGContextRef context = scoped_platform_paint.GetPlatformSurface();
CGContextSaveGState(context);
« ui/gfx/canvas.h ('K') | « ui/gfx/canvas_skia_linux.cc ('k') | ui/gfx/canvas_skia_paint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698