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

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

index 925beeaa699b2e678720610bc62968af4848952d..aa3aec344dabf9f7f8139c6e3b181d8f61a47699 100644

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

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

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

#include "base/stl_util.h"

#include "chrome/browser/ui/views/tabs/native_view_photobooth.h"

#include "third_party/skia/include/core/SkShader.h"

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

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

#include "ui/views/widget/widget.h"

#if defined(USE_AURA)

@@ -135,7 +135,7 @@ gfx::Size DraggedTabView::GetPreferredSize() {

void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) {

gfx::Size ps = GetPreferredSize();

- gfx::CanvasSkia scale_canvas(ps, false);

+ gfx::Canvas scale_canvas(ps, false);

SkBitmap& bitmap_device = const_cast<SkBitmap&>(

skia::GetTopDevice(*scale_canvas.sk_canvas())->accessBitmap(true));

bitmap_device.eraseARGB(0, 0, 0, 0);