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

Side by Side Diff: cc/cc.gyp

Issue 11066132: Remove use_libcc_for_compositor gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 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 | « build/common.gypi ('k') | cc/cc_tests.gyp » ('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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 0, 7 'chromium_code': 0,
8 'use_libcc_for_compositor%': 0,
9 'cc_source_files': [ 8 'cc_source_files': [
10 'hash_pair.h', 9 'hash_pair.h',
11 'own_ptr_vector.h', 10 'own_ptr_vector.h',
12 'scoped_ptr_hash_map.h', 11 'scoped_ptr_hash_map.h',
13 'scoped_ptr_vector.h', 12 'scoped_ptr_vector.h',
14 'bitmap_canvas_layer_texture_updater.cc', 13 'bitmap_canvas_layer_texture_updater.cc',
15 'BitmapCanvasLayerTextureUpdater.h', 14 'BitmapCanvasLayerTextureUpdater.h',
16 'bitmap_skpicture_canvas_layer_texture_updater.cc', 15 'bitmap_skpicture_canvas_layer_texture_updater.cc',
17 'BitmapSkPictureCanvasLayerTextureUpdater.h', 16 'BitmapSkPictureCanvasLayerTextureUpdater.h',
18 'caching_bitmap_canvas_layer_texture_updater.cc', 17 'caching_bitmap_canvas_layer_texture_updater.cc',
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 'video_layer.h', 343 'video_layer.h',
345 ], 344 ],
346 }, 345 },
347 'targets': [ 346 'targets': [
348 { 347 {
349 'target_name': 'cc', 348 'target_name': 'cc',
350 'type': 'static_library', 349 'type': 'static_library',
351 'includes': [ 350 'includes': [
352 'cc.gypi', 351 'cc.gypi',
353 ], 352 ],
354 'conditions': [ 353 'dependencies': [
355 ['use_libcc_for_compositor==1', { 354 '<(DEPTH)/base/base.gyp:base',
356 'dependencies': [ 355 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
357 '<(DEPTH)/base/base.gyp:base', 356 '<(DEPTH)/skia/skia.gyp:skia',
358 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations', 357 '<(DEPTH)/ui/gl/gl.gyp:gl',
359 '<(DEPTH)/skia/skia.gyp:skia', 358 '<(DEPTH)/ui/ui.gyp:ui',
360 '<(DEPTH)/ui/gl/gl.gyp:gl', 359 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
361 '<(DEPTH)/ui/ui.gyp:ui', 360 '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platfo rm_geometry',
362 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf', 361 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support' ,
363 '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_pl atform_geometry', 362 ],
364 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_supp ort', 363 'defines': [
365 ], 364 # http://crbug.com/154052
366 'defines': [ 365 'WEBKIT_GLUE_IMPLEMENTATION=1',
367 # http://crbug.com/154052 366 ],
368 'WEBKIT_GLUE_IMPLEMENTATION=1', 367 'include_dirs': [
369 ], 368 '<(webkit_src_dir)/Source/Platform/chromium',
370 'include_dirs': [ 369 '<@(cc_stubs_dirs)',
371 '<(webkit_src_dir)/Source/Platform/chromium', 370 ],
372 '<@(cc_stubs_dirs)', 371 'sources': [
373 ], 372 '<@(cc_source_files)',
374 'sources': [ 373 'stubs/Extensions3D.h',
375 '<@(cc_source_files)', 374 'stubs/Extensions3DChromium.h',
376 'stubs/Extensions3D.h', 375 'stubs/FloatPoint.h',
377 'stubs/Extensions3DChromium.h', 376 'stubs/FloatPoint3D.h',
378 'stubs/FloatPoint.h', 377 'stubs/FloatQuad.h',
379 'stubs/FloatPoint3D.h', 378 'stubs/FloatRect.h',
380 'stubs/FloatQuad.h', 379 'stubs/FloatSize.h',
381 'stubs/FloatRect.h', 380 'stubs/GraphicsContext3D.h',
382 'stubs/FloatSize.h', 381 'stubs/GraphicsTypes3D.h',
383 'stubs/GraphicsContext3D.h', 382 'stubs/IntPoint.h',
384 'stubs/GraphicsTypes3D.h', 383 'stubs/IntRect.h',
385 'stubs/IntPoint.h', 384 'stubs/IntSize.h',
386 'stubs/IntRect.h', 385 'stubs/NotImplemented.h',
387 'stubs/IntSize.h', 386 'stubs/Region.h',
388 'stubs/NotImplemented.h', 387 'stubs/SkiaUtils.h',
389 'stubs/Region.h', 388 'stubs/TilingData.h',
390 'stubs/SkiaUtils.h', 389 'stubs/TraceEvent.h',
391 'stubs/TilingData.h', 390 'stubs/UnitBezier.h',
392 'stubs/TraceEvent.h',
393 'stubs/UnitBezier.h',
394 391
395 'stubs/extensions_3d_chromium.h', 392 'stubs/extensions_3d_chromium.h',
396 'stubs/extensions_3d.h', 393 'stubs/extensions_3d.h',
397 'stubs/float_point_3d.h', 394 'stubs/float_point_3d.h',
398 'stubs/float_point.h', 395 'stubs/float_point.h',
399 'stubs/float_quad.h', 396 'stubs/float_quad.h',
400 'stubs/float_rect.h', 397 'stubs/float_rect.h',
401 'stubs/float_size.h', 398 'stubs/float_size.h',
402 'stubs/graphics_context_3d.h', 399 'stubs/graphics_context_3d.h',
403 'stubs/graphics_types_3d.h', 400 'stubs/graphics_types_3d.h',
404 'stubs/int_point.h', 401 'stubs/int_point.h',
405 'stubs/int_rect.h', 402 'stubs/int_rect.h',
406 'stubs/int_size.h', 403 'stubs/int_size.h',
407 'stubs/not_implemented.h', 404 'stubs/not_implemented.h',
408 'stubs/skia_utils.h', 405 'stubs/skia_utils.h',
409 'stubs/tiling_data.h', 406 'stubs/tiling_data.h',
410 'stubs/trace_event.h', 407 'stubs/trace_event.h',
411 'stubs/unit_bezier.h', 408 'stubs/unit_bezier.h',
412 ],
413 }],
414 ], 409 ],
415 }, 410 },
416 ], 411 ],
417 } 412 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | cc/cc_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698