ui/gfx/compositor/layer.cc - 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/compositor/layer.cc

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/compositor/layer.cc

diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc

index f4853d73cb5dc6e153b1f34c49afa62989f9c011..fe5d161b0576014567fe05844366e0e07a1ad601 100644

--- a/ui/gfx/compositor/layer.cc

+++ b/ui/gfx/compositor/layer.cc

@@ -17,7 +17,7 @@

#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSolidColorLayer.h"

#include "ui/base/animation/animation.h"

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

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

#include "ui/gfx/compositor/compositor_switches.h"

#include "ui/gfx/compositor/layer_animator.h"

#include "ui/gfx/interpolated_transform.h"

@@ -325,7 +325,7 @@ void Layer::SuppressPaint() {

void Layer::paintContents(WebKit::WebCanvas* web_canvas,

const WebKit::WebRect& clip) {

TRACE_EVENT0("ui", "Layer::paintContents");

- gfx::CanvasSkia canvas(web_canvas);

+ gfx::Canvas canvas(web_canvas);

if (delegate_)

delegate_->OnPaintLayer(&canvas);

}

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