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

Side by Side Diff: build/common.gypi

Issue 8241012: Enable accelerated WebKit compositor for Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 years, 2 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/browser/renderer_host/render_widget_host_view_views.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 320 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', {
321 'webui_task_manager%': 1, 321 'webui_task_manager%': 1,
322 }, { 322 }, {
323 'webui_task_manager%': 0, 323 'webui_task_manager%': 0,
324 }], 324 }],
325 325
326 ['OS=="android"', { 326 ['OS=="android"', {
327 'proprietary_codecs%': 1, 327 'proprietary_codecs%': 1,
328 'enable_webrtc%': 0, 328 'enable_webrtc%': 0,
329 }], 329 }],
330
331 # Use GPU accelerated cross process image transport by default
332 # on TOUCH_UI and linux builds with the Aura window manager
333 ['views_compositor==1 and OS=="linux"', {
334 'views_gpu_image_transport%': 1,
335 }, {
336 'views_gpu_image_transport%': 0,
337 }],
330 ], 338 ],
331 }, 339 },
332 340
333 # Copy conditionally-set variables out one scope. 341 # Copy conditionally-set variables out one scope.
334 'branding%': '<(branding)', 342 'branding%': '<(branding)',
335 'buildtype%': '<(buildtype)', 343 'buildtype%': '<(buildtype)',
336 'target_arch%': '<(target_arch)', 344 'target_arch%': '<(target_arch)',
337 'host_arch%': '<(host_arch)', 345 'host_arch%': '<(host_arch)',
338 'library%': 'static_library', 346 'library%': 'static_library',
339 'toolkit_views%': '<(toolkit_views)', 347 'toolkit_views%': '<(toolkit_views)',
340 'use_only_pure_views%': '<(use_only_pure_views)', 348 'use_only_pure_views%': '<(use_only_pure_views)',
341 'views_compositor%': '<(views_compositor)', 349 'views_compositor%': '<(views_compositor)',
350 'views_gpu_image_transport%': '<(views_gpu_image_transport)',
342 'use_aura%': '<(use_aura)', 351 'use_aura%': '<(use_aura)',
343 'use_openssl%': '<(use_openssl)', 352 'use_openssl%': '<(use_openssl)',
344 'use_nss%': '<(use_nss)', 353 'use_nss%': '<(use_nss)',
345 'os_posix%': '<(os_posix)', 354 'os_posix%': '<(os_posix)',
346 'use_glib%': '<(use_glib)', 355 'use_glib%': '<(use_glib)',
347 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 356 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
348 'use_skia%': '<(use_skia)', 357 'use_skia%': '<(use_skia)',
349 'use_x11%': '<(use_x11)', 358 'use_x11%': '<(use_x11)',
350 'use_gnome_keyring%': '<(use_gnome_keyring)', 359 'use_gnome_keyring%': '<(use_gnome_keyring)',
351 'linux_fpic%': '<(linux_fpic)', 360 'linux_fpic%': '<(linux_fpic)',
(...skipping 21 matching lines...) Expand all
373 'use_threaded_compositing%': '<(use_threaded_compositing)', 382 'use_threaded_compositing%': '<(use_threaded_compositing)',
374 'enable_webrtc%': '<(enable_webrtc)', 383 'enable_webrtc%': '<(enable_webrtc)',
375 'chromium_win_pch%': '<(chromium_win_pch)', 384 'chromium_win_pch%': '<(chromium_win_pch)',
376 'p2p_apis%': '<(p2p_apis)', 385 'p2p_apis%': '<(p2p_apis)',
377 'configuration_policy%': '<(configuration_policy)', 386 'configuration_policy%': '<(configuration_policy)',
378 'safe_browsing%': '<(safe_browsing)', 387 'safe_browsing%': '<(safe_browsing)',
379 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 388 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
380 'asan%': '<(asan)', 389 'asan%': '<(asan)',
381 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 390 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
382 'enable_web_intents%': '<(enable_web_intents)', 391 'enable_web_intents%': '<(enable_web_intents)',
392
383 # Whether to build for Wayland display server 393 # Whether to build for Wayland display server
384 'use_wayland%': 0, 394 'use_wayland%': 0,
385 395
386 # Default to enabled PIE; this is important for ASLR but we need to be 396 # Default to enabled PIE; this is important for ASLR but we need to be
387 # able to turn it off for remote debugging on Chromium OS 397 # able to turn it off for remote debugging on Chromium OS
388 'linux_disable_pie%': 0, 398 'linux_disable_pie%': 0,
389 399
390 # The release channel that this build targets. This is used to restrict 400 # The release channel that this build targets. This is used to restrict
391 # channel-specific build options, like which installer packages to create. 401 # channel-specific build options, like which installer packages to create.
392 # The default is 'all', which does no channel-specific filtering. 402 # The default is 'all', which does no channel-specific filtering.
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 }], 934 }],
925 ['toolkit_views==1', { 935 ['toolkit_views==1', {
926 'defines': ['TOOLKIT_VIEWS=1'], 936 'defines': ['TOOLKIT_VIEWS=1'],
927 }], 937 }],
928 ['use_only_pure_views==1', { 938 ['use_only_pure_views==1', {
929 'defines': ['USE_ONLY_PURE_VIEWS=1'], 939 'defines': ['USE_ONLY_PURE_VIEWS=1'],
930 }], 940 }],
931 ['views_compositor==1', { 941 ['views_compositor==1', {
932 'defines': ['VIEWS_COMPOSITOR=1'], 942 'defines': ['VIEWS_COMPOSITOR=1'],
933 }], 943 }],
944 ['views_gpu_image_transport==1', {
945 'defines': ['VIEWS_GPU_IMAGE_TRANSPORT'],
Ben Goodger (Google) 2011/10/12 18:22:58 The only suggestion i'd have is not to tie the ter
946 }],
934 ['use_aura==1', { 947 ['use_aura==1', {
935 'defines': ['USE_AURA=1'], 948 'defines': ['USE_AURA=1'],
936 }], 949 }],
937 ['use_nss==1', { 950 ['use_nss==1', {
938 'defines': ['USE_NSS=1'], 951 'defines': ['USE_NSS=1'],
939 }], 952 }],
940 ['toolkit_uses_gtk==1', { 953 ['toolkit_uses_gtk==1', {
941 'defines': ['TOOLKIT_USES_GTK=1'], 954 'defines': ['TOOLKIT_USES_GTK=1'],
942 }], 955 }],
943 ['chromeos==1', { 956 ['chromeos==1', {
(...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after
2532 # settings in target dicts. SYMROOT is a special case, because many other 2545 # settings in target dicts. SYMROOT is a special case, because many other
2533 # Xcode variables depend on it, including variables such as 2546 # Xcode variables depend on it, including variables such as
2534 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2547 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2535 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2548 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2536 # files to appear (when present) in the UI as actual files and not red 2549 # files to appear (when present) in the UI as actual files and not red
2537 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2550 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2538 # and therefore SYMROOT, needs to be set at the project level. 2551 # and therefore SYMROOT, needs to be set at the project level.
2539 'SYMROOT': '<(DEPTH)/xcodebuild', 2552 'SYMROOT': '<(DEPTH)/xcodebuild',
2540 }, 2553 },
2541 } 2554 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698