ui/ui.gyp - Issue 10928093: Adds an iOS implementation of gfx::Image.

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 10928093: Adds an iOS implementation of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@skia

Patch Set: Moar GYP and TODOs. Created 8 years, 3 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: ui/ui.gyp

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

index 699e0c2945d1cce1fa962d0d5c8507d9ecfd0da4..03b7e040dd3d28fd2d62b8d2d71a54c69def29e4 100644

--- a/ui/ui.gyp

+++ b/ui/ui.gyp

@@ -41,6 +41,8 @@

# iOS uses a small subset of ui. common_sources are the only files that

# are built on iOS.

'common_sources' : [

+ 'base/layout.cc',

+ 'base/layout.h',

'base/models/tree_node_iterator.h',

'base/models/tree_node_model.h',

'base/ui_base_paths.cc',

@@ -48,6 +50,24 @@

'base/ui_base_switches.cc',

'base/ui_base_switches.h',

'base/ui_export.h',

+ 'gfx/image/image.cc',

+ 'gfx/image/image.h',

+ 'gfx/image/image_ios.mm',

+ 'gfx/image/image_mac.mm',

+ 'gfx/image/image_skia.cc',

+ 'gfx/image/image_skia.h',

+ 'gfx/image/image_skia_operations.cc',

+ 'gfx/image/image_skia_operations.h',

+ 'gfx/image/image_skia_rep.cc',

+ 'gfx/image/image_skia_rep.h',

+ 'gfx/image/image_skia_source.h',

+ 'gfx/image/image_skia_util_ios.h',

+ 'gfx/image/image_skia_util_ios.mm',

+ 'gfx/image/image_skia_util_mac.h',

+ 'gfx/image/image_skia_util_mac.mm',

+ 'gfx/image/image_util.cc',

+ 'gfx/image/image_util.h',

+ 'gfx/image/image_util_ios.mm',

'gfx/insets.cc',

'gfx/insets.h',

'gfx/point.cc',

@@ -264,8 +284,6 @@

'base/l10n/l10n_util_posix.cc',

'base/l10n/l10n_util_win.cc',

'base/l10n/l10n_util_win.h',

- 'base/layout.cc',

- 'base/layout.h',

'base/layout_mac.mm',

'base/models/button_menu_item_model.cc',

'base/models/button_menu_item_model.h',

@@ -421,20 +439,6 @@

'gfx/gfx_paths.h',

'gfx/image/canvas_image_source.cc',

'gfx/image/canvas_image_source.h',

- 'gfx/image/image.cc',

- 'gfx/image/image.h',

- 'gfx/image/image_mac.mm',

- 'gfx/image/image_skia.cc',

- 'gfx/image/image_skia.h',

- 'gfx/image/image_skia_operations.cc',

- 'gfx/image/image_skia_operations.h',

- 'gfx/image/image_skia_rep.cc',

- 'gfx/image/image_skia_rep.h',

- 'gfx/image/image_skia_source.h',

- 'gfx/image/image_skia_util_mac.h',

- 'gfx/image/image_skia_util_mac.mm',

- 'gfx/image/image_util.cc',

- 'gfx/image/image_util.h',

'gfx/interpolated_transform.h',

'gfx/interpolated_transform.cc',

'gfx/mac/nsimage_cache.h',

« no previous file with comments | « ui/gfx/image/image_util_ios.mm ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »