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

Unified Diff: ui/ui.gyp

Issue 9722032: aura: Use platform independent skia::PlatformCanvas when possible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use platform independent PlatformCanvas when use_aura=1 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
« skia/skia.gyp ('K') | « ui/gfx/compositor/compositor.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 2cb8163955b469b9cb14ae7ce6dab7394a9382cc..473751f63b7b9e49f68c68b48811f2c3865cdc45 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -373,14 +373,14 @@
'conditions': [
# TODO(asvitkine): Switch all platforms to use canvas_skia.cc.
# http://crbug.com/105550
- ['use_canvas_skia==1', {
+ ['use_canvas_skia==1 or use_aura==1', {
piman 2012/03/21 16:54:19 I think it would be more maintainable to set use_c
Alexei Svitkine (slow) 2012/03/21 16:59:20 Actually, I agree on this front. Was a little trig
'sources!': [
'gfx/canvas_android.cc',
'gfx/canvas_linux.cc',
'gfx/canvas_mac.mm',
'gfx/canvas_win.cc',
],
- }, { # use_canvas_skia!=1
+ }, { # use_canvas_skia!=1 and use_aura!=1
'sources!': [
'gfx/canvas_skia.cc',
],
« skia/skia.gyp ('K') | « ui/gfx/compositor/compositor.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698