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

Unified Diff: build/common.gypi

Issue 8565019: aura: Use WebKit compositor by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years 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 | « no previous file | ui/views/view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index fcd3d3fb8a9d192db6bbc1971ae85363954bd8ec..bb3726c6c50d49eea1a133c94535b8638d393be8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -51,9 +51,6 @@
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'use_skia_on_mac%': '<(use_skia_on_mac)',
- # WebKit compositor for ui
- 'use_webkit_compositor%': 0,
-
# Compute the architecture that we're building on.
'conditions': [
[ 'OS=="win" or OS=="mac"', {
@@ -77,6 +74,13 @@
['use_aura==1', {
'views_compositor%': 1,
}],
+
+ # Use the WebKit compositor for ui, when Aura is on.
+ ['use_aura==1', {
+ 'use_webkit_compositor%': 1,
+ }, {
+ 'use_webkit_compositor%': 0,
+ }],
],
},
« no previous file with comments | « no previous file | ui/views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698