ui/gfx/canvas_skia_paint.h - Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/canvas_skia_paint.h

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more two win fixes Created 8 years, 9 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:

Index: ui/gfx/canvas_skia_paint.h

diff --git a/ui/gfx/canvas_skia_paint.h b/ui/gfx/canvas_skia_paint.h

index ed061ffbca0adbed19660d33ae2e3f69d859b8d7..885bf32335583d4af19447a2c5135208cc86c3f4 100644

--- a/ui/gfx/canvas_skia_paint.h

+++ b/ui/gfx/canvas_skia_paint.h

@@ -8,7 +8,7 @@

#include "base/logging.h"

#include "skia/ext/canvas_paint.h"

-#include "ui/gfx/canvas_skia.h"

+#include "ui/gfx/canvas.h"

// Define a gfx::CanvasSkiaPaint type that wraps our gfx::Canvas like the

// skia::PlatformCanvasPaint wraps PlatformCanvas.

@@ -16,7 +16,7 @@

namespace skia {

template<> inline

-PlatformCanvas* GetPlatformCanvas(skia::CanvasPaintT<gfx::CanvasSkia>* canvas) {

+PlatformCanvas* GetPlatformCanvas(skia::CanvasPaintT<gfx::Canvas>* canvas) {

PlatformCanvas* platform_canvas = canvas->platform_canvas();

DCHECK(platform_canvas);

return platform_canvas;

@@ -26,7 +26,7 @@ PlatformCanvas* GetPlatformCanvas(skia::CanvasPaintT<gfx::CanvasSkia>* canvas) {

namespace gfx {

-typedef skia::CanvasPaintT<CanvasSkia> CanvasSkiaPaint;

+typedef skia::CanvasPaintT<Canvas> CanvasSkiaPaint;

} // namespace gfx

« no previous file with comments | « ui/gfx/canvas_skia_mac.mm ('k') | ui/gfx/canvas_skia_win.cc » ('j') | no next file with comments »