Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: skia/skia.gyp

Issue 9722032: aura: Use platform independent skia::PlatformCanvas when possible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Consistently check return value of PlatformCanvas::initialize. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/ext/platform_canvas_skia.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 85b34b877ed78ec49218ffa2e8c9d415729c0a32..f20a2c1eb63e4eeb05f900c1a20c7c0d71967667 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -712,6 +712,7 @@
'ext/platform_canvas.h',
'ext/platform_canvas_linux.cc',
'ext/platform_canvas_mac.cc',
+ 'ext/platform_canvas_skia.cc',
'ext/platform_canvas_win.cc',
'ext/platform_device.cc',
'ext/platform_device.h',
@@ -855,6 +856,15 @@
['include', 'ext/platform_canvas_linux\\.cc$'],
],
}],
+ [ 'use_aura == 1', {
Alexei Svitkine (slow) 2012/03/21 21:23:59 Maybe make this 'use_aura == 1 && use_canvas_skia
+ 'sources/': [
+ ['exclude', 'ext/platform_canvas_mac\\.cc$'],
+ ['exclude', 'ext/platform_canvas_linux\\.cc$'],
+ ['exclude', 'ext/platform_canvas_win\\.cc$'],
+ ],
+ }, { # use_aura == 0
+ 'sources/': [ ['exclude', 'ext/platform_canvas_skia\\.cc$'] ],
+ }],
[ 'toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gdk',
« no previous file with comments | « skia/ext/platform_canvas_skia.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698