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

Side by Side Diff: webkit/compositor_bindings/compositor_bindings.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
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 'webkit_compositor_bindings_sources': [ 8 'webkit_compositor_bindings_sources': [
10 'CCThreadImpl.cpp', 9 'CCThreadImpl.cpp',
11 'CCThreadImpl.h', 10 'CCThreadImpl.h',
12 'WebAnimationCurveCommon.cpp', 11 'WebAnimationCurveCommon.cpp',
13 'WebAnimationCurveCommon.h', 12 'WebAnimationCurveCommon.h',
14 'WebAnimationImpl.cpp', 13 'WebAnimationImpl.cpp',
15 'WebAnimationImpl.h', 14 'WebAnimationImpl.h',
16 'WebCompositorImpl.cpp', 15 'WebCompositorImpl.cpp',
17 'WebCompositorImpl.h', 16 'WebCompositorImpl.h',
18 'WebContentLayerImpl.cpp', 17 'WebContentLayerImpl.cpp',
(...skipping 23 matching lines...) Expand all
42 'WebTransformAnimationCurveImpl.cpp', 41 'WebTransformAnimationCurveImpl.cpp',
43 'WebTransformAnimationCurveImpl.h', 42 'WebTransformAnimationCurveImpl.h',
44 ], 43 ],
45 }, 44 },
46 'targets': [ 45 'targets': [
47 { 46 {
48 'target_name': 'webkit_compositor_support', 47 'target_name': 'webkit_compositor_support',
49 'type': 'static_library', 48 'type': 'static_library',
50 'dependencies': [ 49 'dependencies': [
51 '../../skia/skia.gyp:skia', 50 '../../skia/skia.gyp:skia',
51 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
52 'webkit_compositor_bindings',
52 ], 53 ],
53 'sources': [ 54 'sources': [
54 'web_compositor_support_impl.cc', 55 'web_compositor_support_impl.cc',
55 'web_compositor_support_impl.h', 56 'web_compositor_support_impl.h',
56 ], 57 ],
57 'includes': [ 58 'includes': [
58 '../../cc/cc.gypi', 59 '../../cc/cc.gypi',
59 ], 60 ],
60 'include_dirs': [ 61 'include_dirs': [
61 '../..', 62 '../..',
63 '../../cc',
62 '<(SHARED_INTERMEDIATE_DIR)/webkit', 64 '<(SHARED_INTERMEDIATE_DIR)/webkit',
63 '<(webkit_src_dir)/Source/Platform/chromium', 65 '<(webkit_src_dir)/Source/Platform/chromium',
66 '<@(cc_stubs_dirs)',
64 ], 67 ],
65 'conditions': [ 68 },
66 ['use_libcc_for_compositor==1', { 69 {
67 'include_dirs': [ 70 'target_name': 'webkit_compositor_bindings',
68 '../../cc', 71 'type': 'static_library',
69 '<@(cc_stubs_dirs)', 72 'includes': [
70 ], 73 '../../cc/cc.gypi',
71 'dependencies': [ 74 ],
72 'webkit_compositor_bindings', 75 'dependencies': [
73 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf', 76 '../../base/base.gyp:base',
74 ], 77 '../../cc/cc.gyp:cc',
75 'defines': [ 78 '../../skia/skia.gyp:skia',
76 'USE_LIBCC_FOR_COMPOSITOR', 79 # We have to depend on WTF directly to pick up the correct defines for W TF headers - for instance USE_SYSTEM_MALLOC.
77 ], 80 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
78 }], 81 ],
82 'include_dirs': [
83 '../../cc',
84 '<@(cc_stubs_dirs)',
85 '<(webkit_src_dir)/Source/Platform/chromium',
86 ],
87 'sources': [
88 '<@(webkit_compositor_bindings_sources)',
89 'webcore_convert.cc',
90 'webcore_convert.h',
79 ], 91 ],
80 }, 92 },
81 ], 93 ],
82 'conditions': [
83 ['use_libcc_for_compositor==1', {
84 'targets': [
85 {
86 'target_name': 'webkit_compositor_bindings',
87 'type': 'static_library',
88 'includes': [
89 '../../cc/cc.gypi',
90 ],
91 'dependencies': [
92 '../../base/base.gyp:base',
93 '../../cc/cc.gyp:cc',
94 '../../skia/skia.gyp:skia',
95 # We have to depend on WTF directly to pick up the correct defines f or WTF headers - for instance USE_SYSTEM_MALLOC.
96 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
97 ],
98 'include_dirs': [
99 '../../cc',
100 '<@(cc_stubs_dirs)',
101 '<(webkit_src_dir)/Source/Platform/chromium',
102 ],
103 'sources': [
104 '<@(webkit_compositor_bindings_sources)',
105 'webcore_convert.cc',
106 'webcore_convert.h',
107 ],
108 'defines': [
109 'USE_LIBCC_FOR_COMPOSITOR',
110 ],
111 },
112 ],
113 }],
114 ],
115 } 94 }
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/WebCompositorImpl.cpp ('k') | webkit/compositor_bindings/compositor_bindings_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698