views/controls/menu/menu_scroll_view_container.cc - Issue 6879013: skia::PlatformCanvas is being deprecated. Going forward we will use gfx::Canvas wherever we need ...

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: views/controls/menu/menu_scroll_view_container.cc

Issue 6879013: skia::PlatformCanvas is being deprecated. Going forward we will use gfx::Canvas wherever we need ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 8 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: views/controls/menu/menu_scroll_view_container.cc

===================================================================

--- views/controls/menu/menu_scroll_view_container.cc (revision 82144)

+++ views/controls/menu/menu_scroll_view_container.cc (working copy)

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

gfx::Rect item_bounds(0, 0, width(), height());

NativeTheme::ExtraParams extra;

extra.menu_item.is_selected = false;

- NativeTheme::instance()->Paint(canvas->AsCanvasSkia(),

+ NativeTheme::instance()->Paint(canvas->AsCanvasSkia()->skia_canvas(),

NativeTheme::kMenuItemBackground,

NativeTheme::kNormal, item_bounds, extra);

SkColor arrow_color = color_utils::GetSysSkColor(COLOR_MENUTEXT);

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

HDC dc = canvas->BeginPlatformPaint();

gfx::Rect bounds(0, 0, width(), height());

NativeTheme::ExtraParams extra;

- NativeTheme::instance()->Paint(canvas->AsCanvasSkia(),

+ NativeTheme::instance()->Paint(canvas->AsCanvasSkia()->skia_canvas(),

NativeTheme::kMenuPopupBackground, NativeTheme::kNormal, bounds, extra);

canvas->EndPlatformPaint();

#elif defined(OS_CHROMEOS)

« no previous file with comments | « views/controls/menu/menu_item_view_win.cc ('k') | views/controls/menu/menu_separator_win.cc » ('j') | no next file with comments »