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

Side by Side Diff: ui/gfx/compositor/compositor.gyp

Issue 8486020: compositor_unittests target is unimplmented on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Nico's comments (#2) Created 9 years, 1 month 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) 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'target_defaults': { 9 'target_defaults': {
10 'sources/': [ 10 'sources/': [
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'layer_animation_element.h', 54 'layer_animation_element.h',
55 'layer_animation_observer.h', 55 'layer_animation_observer.h',
56 'layer_animation_sequence.cc', 56 'layer_animation_sequence.cc',
57 'layer_animation_sequence.h', 57 'layer_animation_sequence.h',
58 'layer_animator.cc', 58 'layer_animator.cc',
59 'layer_animator.h', 59 'layer_animator.h',
60 'screen_rotation.cc', 60 'screen_rotation.cc',
61 'screen_rotation.h', 61 'screen_rotation.h',
62 ], 62 ],
63 'conditions': [ 63 'conditions': [
64 ['os_posix == 1 and OS != "mac"', { 64 ['os_posix == 1', {
65 'sources!': [ 65 'sources!': [
66 'compositor_stub.cc', 66 'compositor_stub.cc',
67 ], 67 ],
68 }], 68 }],
69 ['OS == "win" and views_compositor == 1', { 69 ['OS == "win" and views_compositor == 1', {
70 'sources!': [ 70 'sources!': [
71 'compositor_stub.cc', 71 'compositor_stub.cc',
72 ], 72 ],
73 # TODO(sky): before we make this real need to remove 73 # TODO(sky): before we make this real need to remove
74 # IDR_BITMAP_BRUSH_IMAGE. 74 # IDR_BITMAP_BRUSH_IMAGE.
75 'dependencies': [ 75 'dependencies': [
76 '<(DEPTH)/ui/ui.gyp:gfx_resources', 76 '<(DEPTH)/ui/ui.gyp:gfx_resources',
77 ], 77 ],
78 'link_settings': { 78 'link_settings': {
79 'libraries': [ 79 'libraries': [
80 '-ld3d10.lib', 80 '-ld3d10.lib',
81 '-ld3dx10d.lib', 81 '-ld3dx10d.lib',
82 '-ldxerr.lib', 82 '-ldxerr.lib',
83 '-ldxguid.lib', 83 '-ldxguid.lib',
84 ] 84 ]
85 }, 85 },
86 }], 86 }],
87 ['OS == "win" and views_compositor == 0', { 87 ['OS == "win" and views_compositor == 0', {
88 'sources/': [ 88 'sources/': [
89 ['exclude', '^compositor_win.cc'], 89 ['exclude', '^compositor_win.cc'],
90 ], 90 ],
91 }], 91 }],
92 ['use_webkit_compositor == 1', { 92 ['use_webkit_compositor == 1', {
93 'sources/': [ 93 'sources/': [
94 ['exclude', '^compositor_(gl|win|stub).(h|cc)$'], 94 ['exclude', '^compositor_(gl|mac|win|stub).(h|cc|mm)$'],
95 ], 95 ],
96 'dependencies': [ 96 'dependencies': [
97 '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi', 97 '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
98 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', 98 '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
99 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu', 99 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
100 ], 100 ],
101 }, { 101 }, {
102 'sources!': [ 102 'sources!': [
103 'compositor_cc.cc', 103 'compositor_cc.cc',
104 'compositor_cc.h', 104 'compositor_cc.h',
105 ], 105 ],
106 } 106 }
107 ], 107 ],
108 ], 108 ],
109 }, 109 },
110 { 110 {
111 'target_name': 'compositor_test_support', 111 'target_name': 'compositor_test_support',
112 'type': 'static_library', 112 'type': 'static_library',
113 'dependencies': [ 113 'dependencies': [
114 '<(DEPTH)/base/base.gyp:base', 114 '<(DEPTH)/base/base.gyp:base',
115 ], 115 ],
116 'sources': [ 116 'sources': [
117 'compositor_test_support.cc', 117 'compositor_test_support.cc',
118 'compositor_test_support.h', 118 'compositor_test_support.h',
119 ], 119 ],
120 'conditions': [ 120 'conditions': [
121 ['use_webkit_compositor == 1', { 121 ['use_webkit_compositor == 1', {
122 'dependencies': [ 122 'dependencies': [
123 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
124 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support', 123 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
125 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:web kit', 124 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:web kit',
126 ], 125 ],
127 }], 126 }],
127 ['use_webkit_compositor == 1 and OS != "mac"', {
128 'dependencies': [
129 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
130 ],
131 }],
128 ], 132 ],
129 }, 133 },
130 { 134 {
131 'target_name': 'compositor_unittests', 135 'target_name': 'compositor_unittests',
132 'type': 'executable', 136 'type': 'executable',
133 'dependencies': [ 137 'dependencies': [
134 '<(DEPTH)/base/base.gyp:base', 138 '<(DEPTH)/base/base.gyp:base',
135 '<(DEPTH)/base/base.gyp:test_support_base', 139 '<(DEPTH)/base/base.gyp:test_support_base',
136 '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', 140 '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
137 '<(DEPTH)/skia/skia.gyp:skia', 141 '<(DEPTH)/skia/skia.gyp:skia',
138 '<(DEPTH)/testing/gtest.gyp:gtest', 142 '<(DEPTH)/testing/gtest.gyp:gtest',
139 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 143 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
140 '<(DEPTH)/ui/ui.gyp:gfx_resources', 144 '<(DEPTH)/ui/ui.gyp:gfx_resources',
141 '<(DEPTH)/ui/ui.gyp:ui', 145 '<(DEPTH)/ui/ui.gyp:ui',
142 '<(DEPTH)/ui/ui.gyp:ui_resources', 146 '<(DEPTH)/ui/ui.gyp:ui_resources',
143 'compositor', 147 'compositor',
144 'compositor_test_support', 148 'compositor_test_support',
145 'test_compositor', 149 'test_compositor',
146 ], 150 ],
147 'sources': [ 151 'sources': [
148 'layer_animation_element_unittest.cc', 152 'layer_animation_element_unittest.cc',
149 'layer_animation_sequence_unittest.cc', 153 'layer_animation_sequence_unittest.cc',
150 'layer_animator_unittest.cc', 154 'layer_animator_unittest.cc',
151 'layer_unittest.cc', 155 'layer_unittest.cc',
152 'run_all_unittests.cc', 156 'run_all_unittests.cc',
153 'test_compositor_host.h', 157 'test_compositor_host.h',
154 'test_compositor_host_linux.cc', 158 'test_compositor_host_linux.cc',
159 'test_compositor_host_mac.mm',
155 'test_compositor_host_win.cc', 160 'test_compositor_host_win.cc',
156 'test_layer_animation_delegate.cc', 161 'test_layer_animation_delegate.cc',
157 'test_layer_animation_delegate.h', 162 'test_layer_animation_delegate.h',
158 'test_layer_animation_observer.cc', 163 'test_layer_animation_observer.cc',
159 'test_layer_animation_observer.h', 164 'test_layer_animation_observer.h',
160 'test_suite.cc', 165 'test_suite.cc',
161 'test_suite.h', 166 'test_suite.h',
162 'test_utils.cc', 167 'test_utils.cc',
163 'test_utils.h', 168 'test_utils.h',
164 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 169 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
(...skipping 30 matching lines...) Expand all
195 'test_compositor.cc', 200 'test_compositor.cc',
196 'test_compositor.h', 201 'test_compositor.h',
197 'test_texture.cc', 202 'test_texture.cc',
198 'test_texture.h', 203 'test_texture.h',
199 ], 204 ],
200 }], 205 }],
201 ], 206 ],
202 }, 207 },
203 ], 208 ],
204 } 209 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698