skia/skia.gyp - Issue 118488: Add file icons to chrome://downloads/ on the Mac. Add Skia helper CGImageToSkBitmap().

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: skia/skia.gyp

Issue 118488: Add file icons to chrome://downloads/ on the Mac. Add Skia helper CGImageToSkBitmap(). (Closed)

Patch Set: Switch to using |-drawInRect:| rather than |-drawAtPoint:| Created 11 years, 6 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: skia/skia.gyp

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

index 912e80a6124257b2644f309d38959c16a49b45d1..a3e55b2e660a63a8d9870f5939735072a85f410d 100755

--- a/skia/skia.gyp

+++ b/skia/skia.gyp

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

'ext/SkTypeface_fake.cpp',

'ext/skia_utils.cc',

'ext/skia_utils.h',

- 'ext/skia_utils_mac.cc',

+ 'ext/skia_utils_mac.mm',

'ext/skia_utils_mac.h',

'ext/skia_utils_win.cc',

'ext/skia_utils_win.h',

@@ -608,9 +608,14 @@

'defines': [

'SK_BUILD_FOR_MAC',

- 'include_dirs': [

- '../third_party/skia/include/utils/mac',

- ],

+ 'include_dirs': [

+ '../third_party/skia/include/utils/mac',

+ ],

+ 'link_settings': {

+ 'libraries': [

+ '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',

+ ],

+ },

}],

[ 'OS == "win"', {

'sources!': [

« no previous file with comments | « skia/ext/skia_utils_mac.mm ('k') | webkit/glue/image_decoder.cc » ('j') | no next file with comments »