ui/ui.gyp - Issue 22835002: Supports gfx::FontList in gfx::Canvas and ui::ElideText family.

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/ui.gyp

Issue 22835002: Supports gfx::FontList in gfx::Canvas and ui::ElideText family. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Adds canvas_ios.mm and removes canvas_android.cc. Created 7 years, 4 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/ui.gyp

diff --git a/ui/ui.gyp b/ui/ui.gyp

index 2aa50d4d259fb6e69234600b1420bda47af1efef..1d451c2a4dc29375910e9f80b3c809657fc93771 100644

--- a/ui/ui.gyp

+++ b/ui/ui.gyp

@@ -417,14 +417,14 @@

'gfx/break_list.h',

'gfx/canvas.cc',

'gfx/canvas.h',

- 'gfx/canvas_android.cc',

+ 'gfx/canvas_ios.mm',

'gfx/canvas_mac.mm',

+ 'gfx/canvas_paint_gtk.cc',

'gfx/canvas_paint_gtk.h',

'gfx/canvas_paint_mac.h',

- 'gfx/canvas_paint_win.h',

- 'gfx/canvas_paint_gtk.cc',

'gfx/canvas_paint_mac.mm',

'gfx/canvas_paint_win.cc',

+ 'gfx/canvas_paint_win.h',

'gfx/canvas_skia.cc',

'gfx/canvas_skia_paint.h',

'gfx/codec/jpeg_codec.cc',

@@ -641,7 +641,6 @@

# http://crbug.com/105550

['use_canvas_skia==1', {

'sources!': [

- 'gfx/canvas_android.cc',

'gfx/canvas_mac.mm',

}, { # use_canvas_skia!=1