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

Side by Side Diff: build/common.gypi

Issue 9141034: Always use webkit compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared build Created 8 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_dll.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 ['OS=="win" or chromeos==1 or use_aura==1', { 76 ['OS=="win" or chromeos==1 or use_aura==1', {
77 'toolkit_views%': 1, 77 'toolkit_views%': 1,
78 }, { 78 }, {
79 'toolkit_views%': 0, 79 'toolkit_views%': 0,
80 }], 80 }],
81 81
82 # Use the views compositor when using the Aura window manager. 82 # Use the views compositor when using the Aura window manager.
83 ['use_aura==1', { 83 ['use_aura==1', {
84 'views_compositor%': 1, 84 'views_compositor%': 1,
85 }], 85 }],
86
87 # Use the WebKit compositor for ui, when Aura is on.
88 ['use_aura==1', {
89 'use_webkit_compositor%': 1,
90 }, {
91 'use_webkit_compositor%': 0,
92 }],
93 ], 86 ],
94 }, 87 },
95 88
96 # Copy conditionally-set variables out one scope. 89 # Copy conditionally-set variables out one scope.
97 'chromeos%': '<(chromeos)', 90 'chromeos%': '<(chromeos)',
98 'host_arch%': '<(host_arch)', 91 'host_arch%': '<(host_arch)',
99 'toolkit_views%': '<(toolkit_views)', 92 'toolkit_views%': '<(toolkit_views)',
100 'views_compositor%': '<(views_compositor)', 93 'views_compositor%': '<(views_compositor)',
101 'use_webkit_compositor%': '<(use_webkit_compositor)',
102 'use_aura%': '<(use_aura)', 94 'use_aura%': '<(use_aura)',
103 'use_ash%': '<(use_ash)', 95 'use_ash%': '<(use_ash)',
104 'use_openssl%': '<(use_openssl)', 96 'use_openssl%': '<(use_openssl)',
105 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 97 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
106 'use_skia_on_mac%': '<(use_skia_on_mac)', 98 'use_skia_on_mac%': '<(use_skia_on_mac)',
107 99
108 # We used to provide a variable for changing how libraries were built. 100 # We used to provide a variable for changing how libraries were built.
109 # This variable remains until we can clean up all the users. 101 # This variable remains until we can clean up all the users.
110 # This needs to be one nested variables dict in so that dependent 102 # This needs to be one nested variables dict in so that dependent
111 # gyp files can make use of it in their outer variables. (Yikes!) 103 # gyp files can make use of it in their outer variables. (Yikes!)
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 # provide a build speedup of 20-25%. There are a couple of 246 # provide a build speedup of 20-25%. There are a couple of
255 # small workarounds you may need to use when using VS 2008 (but 247 # small workarounds you may need to use when using VS 2008 (but
256 # not 2010), see 248 # not 2010), see
257 # http://code.google.com/p/chromium/wiki/WindowsPrecompiledHeaders 249 # http://code.google.com/p/chromium/wiki/WindowsPrecompiledHeaders
258 # for details. 250 # for details.
259 'chromium_win_pch%': 0, 251 'chromium_win_pch%': 0,
260 252
261 # Enable plug-in installation by default. 253 # Enable plug-in installation by default.
262 'enable_plugin_installation%': 1, 254 'enable_plugin_installation%': 1,
263 255
256 # Use the WebKit compositor for ui.
257 'use_webkit_compositor%': 1,
258
264 'conditions': [ 259 'conditions': [
265 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of 260 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
266 # the 'conditions' clause. Initial attempts resulted in chromium and 261 # the 'conditions' clause. Initial attempts resulted in chromium and
267 # webkit disagreeing on its setting. 262 # webkit disagreeing on its setting.
268 ['OS=="mac"', { 263 ['OS=="mac"', {
269 'use_skia%': '<(use_skia_on_mac)', 264 'use_skia%': '<(use_skia_on_mac)',
270 # Mac uses clang by default, so turn on the plugin as well. 265 # Mac uses clang by default, so turn on the plugin as well.
271 'clang_use_chrome_plugins%': 1, 266 'clang_use_chrome_plugins%': 1,
272 }, { 267 }, {
273 'use_skia%': 1, 268 'use_skia%': 1,
(...skipping 2543 matching lines...) Expand 10 before | Expand all | Expand 10 after
2817 # settings in target dicts. SYMROOT is a special case, because many other 2812 # settings in target dicts. SYMROOT is a special case, because many other
2818 # Xcode variables depend on it, including variables such as 2813 # Xcode variables depend on it, including variables such as
2819 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2814 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2820 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2815 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2821 # files to appear (when present) in the UI as actual files and not red 2816 # files to appear (when present) in the UI as actual files and not red
2822 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2817 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2823 # and therefore SYMROOT, needs to be set at the project level. 2818 # and therefore SYMROOT, needs to be set at the project level.
2824 'SYMROOT': '<(DEPTH)/xcodebuild', 2819 'SYMROOT': '<(DEPTH)/xcodebuild',
2825 }, 2820 },
2826 } 2821 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698