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

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

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. 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 27 matching lines...) Expand all
38 'compositor.cc', 38 'compositor.cc',
39 'compositor.h', 39 'compositor.h',
40 'compositor_export.h', 40 'compositor_export.h',
41 'compositor_gl.cc', 41 'compositor_gl.cc',
42 'compositor_gl.h', 42 'compositor_gl.h',
43 'compositor_cc.cc', 43 'compositor_cc.cc',
44 'compositor_cc.h', 44 'compositor_cc.h',
45 'compositor_observer.h', 45 'compositor_observer.h',
46 'compositor_stub.cc', 46 'compositor_stub.cc',
47 'compositor_win.cc', 47 'compositor_win.cc',
48 'dummy_layer_animation_delegate.cc',
49 'dummy_layer_animation_delegate.h',
48 'layer.cc', 50 'layer.cc',
49 'layer.h', 51 'layer.h',
50 'layer_animation_delegate.h', 52 'layer_animation_delegate.h',
51 'layer_animation_element.cc', 53 'layer_animation_element.cc',
52 'layer_animation_element.h', 54 'layer_animation_element.h',
53 'layer_animation_manager.cc',
54 'layer_animation_manager.h',
55 'layer_animation_sequence.cc', 55 'layer_animation_sequence.cc',
56 'layer_animation_sequence.h', 56 'layer_animation_sequence.h',
57 'layer_animator.cc', 57 'layer_animator.cc',
58 'layer_animator.h', 58 'layer_animator.h',
59 ], 59 ],
60 'conditions': [ 60 'conditions': [
61 ['os_posix == 1 and OS != "mac"', { 61 ['os_posix == 1 and OS != "mac"', {
62 'sources!': [ 62 'sources!': [
63 'compositor_stub.cc', 63 'compositor_stub.cc',
64 ], 64 ],
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 ], 154 ],
155 'sources': [ 155 'sources': [
156 'layer_animation_element_unittest.cc', 156 'layer_animation_element_unittest.cc',
157 'layer_animation_sequence_unittest.cc', 157 'layer_animation_sequence_unittest.cc',
158 'layer_animator_unittest.cc', 158 'layer_animator_unittest.cc',
159 'layer_unittest.cc', 159 'layer_unittest.cc',
160 'run_all_unittests.cc', 160 'run_all_unittests.cc',
161 'test_compositor_host.h', 161 'test_compositor_host.h',
162 'test_compositor_host_linux.cc', 162 'test_compositor_host_linux.cc',
163 'test_compositor_host_win.cc', 163 'test_compositor_host_win.cc',
164 'test_layer_animation_delegate.cc',
165 'test_layer_animation_delegate.h',
166 'test_suite.cc', 164 'test_suite.cc',
167 'test_suite.h', 165 'test_suite.h',
168 'test_texture.cc', 166 'test_texture.cc',
169 'test_texture.h', 167 'test_texture.h',
170 'test_utils.cc', 168 'test_utils.cc',
171 'test_utils.h', 169 'test_utils.h',
172 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 170 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
173 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 171 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
174 ], 172 ],
175 'conditions': [ 173 'conditions': [
176 # osmesa GL implementation is used on linux. 174 # osmesa GL implementation is used on linux.
177 ['OS=="linux"', { 175 ['OS=="linux"', {
178 'dependencies': [ 176 'dependencies': [
179 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 177 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
180 ], 178 ],
181 }], 179 }],
182 ['OS!="mac"', { 180 ['OS!="mac"', {
183 'dependencies': [ 181 'dependencies': [
184 '<(DEPTH)/chrome/chrome.gyp:packed_resources', 182 '<(DEPTH)/chrome/chrome.gyp:packed_resources',
185 ], 183 ],
186 }], 184 }],
187 ], 185 ],
188 }, 186 },
189 ], 187 ],
190 } 188 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698