chrome/browser/ui/views/tabs/tab.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: chrome/browser/ui/views/tabs/tab.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: chrome/browser/ui/views/tabs/tab.cc

diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc

index 38ac6a963ab1ab44e2a7d114ff428a945bc83f42..97aa224e1421a5ff3b454cd5a44ca48b18028b3c 100644

--- a/chrome/browser/ui/views/tabs/tab.cc

+++ b/chrome/browser/ui/views/tabs/tab.cc

@@ -19,7 +19,7 @@

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

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

#include "ui/base/resource/resource_bundle.h"

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

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

#include "ui/gfx/favicon_size.h"

#include "ui/gfx/font.h"

#include "ui/gfx/path.h"

@@ -380,7 +380,7 @@ void Tab::PaintTabBackground(gfx::Canvas* canvas) {

void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {

// Render the inactive tab background. We'll use this for clipping.

- gfx::CanvasSkia background_canvas(size(), false);

+ gfx::Canvas background_canvas(size(), false);

PaintInactiveTabBackground(&background_canvas);

SkBitmap background_image = background_canvas.ExtractBitmap();