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

Side by Side Diff: build/common.gypi

Issue 8222028: Use WebKit compositor in ui::Layer (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase,fixes 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/chrome_browser_main.cc » ('j') | ui/aura_shell/DEPS » ('J')
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'use_openssl%': 0, 44 'use_openssl%': 0,
45 }, 45 },
46 # Copy conditionally-set variables out one scope. 46 # Copy conditionally-set variables out one scope.
47 'chromeos%': '<(chromeos)', 47 'chromeos%': '<(chromeos)',
48 'use_only_pure_views%': '<(use_only_pure_views)', 48 'use_only_pure_views%': '<(use_only_pure_views)',
49 'touchui%': '<(touchui)', 49 'touchui%': '<(touchui)',
50 'views_compositor%': '<(views_compositor)', 50 'views_compositor%': '<(views_compositor)',
51 'use_aura%': '<(use_aura)', 51 'use_aura%': '<(use_aura)',
52 'use_openssl%': '<(use_openssl)', 52 'use_openssl%': '<(use_openssl)',
53 53
54 # WebKit compositor for ui
55 'use_webkit_compositor%': 0,
56
54 # Compute the architecture that we're building on. 57 # Compute the architecture that we're building on.
55 'conditions': [ 58 'conditions': [
56 [ 'OS=="win" or OS=="mac"', { 59 [ 'OS=="win" or OS=="mac"', {
57 'host_arch%': 'ia32', 60 'host_arch%': 'ia32',
58 }, { 61 }, {
59 # This handles the Unix platforms for which there is some support. 62 # This handles the Unix platforms for which there is some support.
60 # Anything else gets passed through, which probably won't work very 63 # Anything else gets passed through, which probably won't work very
61 # well; such hosts should pass an explicit target_arch to gyp. 64 # well; such hosts should pass an explicit target_arch to gyp.
62 'host_arch%': 65 'host_arch%':
63 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 66 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
(...skipping 30 matching lines...) Expand all
94 }, 97 },
95 98
96 # Copy conditionally-set variables out one scope. 99 # Copy conditionally-set variables out one scope.
97 'chromeos%': '<(chromeos)', 100 'chromeos%': '<(chromeos)',
98 'touchui%': '<(touchui)', 101 'touchui%': '<(touchui)',
99 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 102 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
100 'host_arch%': '<(host_arch)', 103 'host_arch%': '<(host_arch)',
101 'toolkit_views%': '<(toolkit_views)', 104 'toolkit_views%': '<(toolkit_views)',
102 'use_only_pure_views%': '<(use_only_pure_views)', 105 'use_only_pure_views%': '<(use_only_pure_views)',
103 'views_compositor%': '<(views_compositor)', 106 'views_compositor%': '<(views_compositor)',
107 'use_webkit_compositor%': '<(use_webkit_compositor)',
104 'use_aura%': '<(use_aura)', 108 'use_aura%': '<(use_aura)',
105 'use_openssl%': '<(use_openssl)', 109 'use_openssl%': '<(use_openssl)',
106 110
107 # We used to provide a variable for changing how libraries were built. 111 # We used to provide a variable for changing how libraries were built.
108 # This variable remains until we can clean up all the users. 112 # This variable remains until we can clean up all the users.
109 # This needs to be one nested variables dict in so that dependent 113 # This needs to be one nested variables dict in so that dependent
110 # gyp files can make use of it in their outer variables. (Yikes!) 114 # gyp files can make use of it in their outer variables. (Yikes!)
111 # http://code.google.com/p/chromium/issues/detail?id=83308 115 # http://code.google.com/p/chromium/issues/detail?id=83308
112 'library%': 'static_library', 116 'library%': 'static_library',
113 117
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 'webui_task_manager%': 0, 330 'webui_task_manager%': 0,
327 }], 331 }],
328 332
329 ['OS=="android"', { 333 ['OS=="android"', {
330 'proprietary_codecs%': 1, 334 'proprietary_codecs%': 1,
331 'enable_webrtc%': 0, 335 'enable_webrtc%': 0,
332 }], 336 }],
333 337
334 # Use GPU accelerated cross process image transport by default 338 # Use GPU accelerated cross process image transport by default
335 # on TOUCH_UI and linux builds with the Aura window manager 339 # on TOUCH_UI and linux builds with the Aura window manager
336 ['views_compositor==1 and OS=="linux"', { 340 ['views_compositor==1 and OS=="linux" and use_webkit_compositor!=1', {
337 'views_gpu_image_transport%': 1, 341 'views_gpu_image_transport%': 1,
338 }, { 342 }, {
339 'views_gpu_image_transport%': 0, 343 'views_gpu_image_transport%': 0,
340 }], 344 }],
341 ], 345 ],
342 }, 346 },
343 347
344 # Copy conditionally-set variables out one scope. 348 # Copy conditionally-set variables out one scope.
345 'branding%': '<(branding)', 349 'branding%': '<(branding)',
346 'buildtype%': '<(buildtype)', 350 'buildtype%': '<(buildtype)',
347 'target_arch%': '<(target_arch)', 351 'target_arch%': '<(target_arch)',
348 'host_arch%': '<(host_arch)', 352 'host_arch%': '<(host_arch)',
349 'library%': 'static_library', 353 'library%': 'static_library',
350 'toolkit_views%': '<(toolkit_views)', 354 'toolkit_views%': '<(toolkit_views)',
351 'use_only_pure_views%': '<(use_only_pure_views)', 355 'use_only_pure_views%': '<(use_only_pure_views)',
352 'views_compositor%': '<(views_compositor)', 356 'views_compositor%': '<(views_compositor)',
353 'views_gpu_image_transport%': '<(views_gpu_image_transport)', 357 'views_gpu_image_transport%': '<(views_gpu_image_transport)',
358 'use_webkit_compositor%': '<(use_webkit_compositor)',
354 'use_aura%': '<(use_aura)', 359 'use_aura%': '<(use_aura)',
355 'use_openssl%': '<(use_openssl)', 360 'use_openssl%': '<(use_openssl)',
356 'use_nss%': '<(use_nss)', 361 'use_nss%': '<(use_nss)',
357 'os_posix%': '<(os_posix)', 362 'os_posix%': '<(os_posix)',
358 'use_glib%': '<(use_glib)', 363 'use_glib%': '<(use_glib)',
359 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 364 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
360 'use_skia%': '<(use_skia)', 365 'use_skia%': '<(use_skia)',
361 'use_x11%': '<(use_x11)', 366 'use_x11%': '<(use_x11)',
362 'use_gnome_keyring%': '<(use_gnome_keyring)', 367 'use_gnome_keyring%': '<(use_gnome_keyring)',
363 'linux_fpic%': '<(linux_fpic)', 368 'linux_fpic%': '<(linux_fpic)',
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 }], 952 }],
948 ['use_only_pure_views==1', { 953 ['use_only_pure_views==1', {
949 'defines': ['USE_ONLY_PURE_VIEWS=1'], 954 'defines': ['USE_ONLY_PURE_VIEWS=1'],
950 }], 955 }],
951 ['views_compositor==1', { 956 ['views_compositor==1', {
952 'defines': ['VIEWS_COMPOSITOR=1'], 957 'defines': ['VIEWS_COMPOSITOR=1'],
953 }], 958 }],
954 ['views_gpu_image_transport==1', { 959 ['views_gpu_image_transport==1', {
955 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 960 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
956 }], 961 }],
962 ['use_webkit_compositor==1', {
963 'defines': ['USE_WEBKIT_COMPOSITOR=1'],
964 }],
957 ['use_aura==1', { 965 ['use_aura==1', {
958 'defines': ['USE_AURA=1'], 966 'defines': ['USE_AURA=1'],
959 }], 967 }],
960 ['use_nss==1', { 968 ['use_nss==1', {
961 'defines': ['USE_NSS=1'], 969 'defines': ['USE_NSS=1'],
962 }], 970 }],
963 ['toolkit_uses_gtk==1', { 971 ['toolkit_uses_gtk==1', {
964 'defines': ['TOOLKIT_USES_GTK=1'], 972 'defines': ['TOOLKIT_USES_GTK=1'],
965 }], 973 }],
966 ['chromeos==1', { 974 ['chromeos==1', {
(...skipping 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2556 # settings in target dicts. SYMROOT is a special case, because many other 2564 # settings in target dicts. SYMROOT is a special case, because many other
2557 # Xcode variables depend on it, including variables such as 2565 # Xcode variables depend on it, including variables such as
2558 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2566 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2559 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2567 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2560 # files to appear (when present) in the UI as actual files and not red 2568 # files to appear (when present) in the UI as actual files and not red
2561 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2569 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2562 # and therefore SYMROOT, needs to be set at the project level. 2570 # and therefore SYMROOT, needs to be set at the project level.
2563 'SYMROOT': '<(DEPTH)/xcodebuild', 2571 'SYMROOT': '<(DEPTH)/xcodebuild',
2564 }, 2572 },
2565 } 2573 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | ui/aura_shell/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698