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

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: Address reviewer comments. 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
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 24 matching lines...) Expand all
35 ], 35 ],
36 'sources': [ 36 'sources': [
37 'compositor.cc', 37 'compositor.cc',
38 'compositor.h', 38 'compositor.h',
39 'compositor_export.h', 39 'compositor_export.h',
40 'compositor_gl.cc', 40 'compositor_gl.cc',
41 'compositor_gl.h', 41 'compositor_gl.h',
42 'compositor_observer.h', 42 'compositor_observer.h',
43 'compositor_stub.cc', 43 'compositor_stub.cc',
44 'compositor_win.cc', 44 'compositor_win.cc',
45 'dummy_layer_animation_delegate.cc',
46 'dummy_layer_animation_delegate.h',
45 'layer.cc', 47 'layer.cc',
46 'layer.h', 48 'layer.h',
47 'layer_animation_delegate.h', 49 'layer_animation_delegate.h',
48 'layer_animation_element.cc', 50 'layer_animation_element.cc',
49 'layer_animation_element.h', 51 'layer_animation_element.h',
50 'layer_animation_manager.cc',
51 'layer_animation_manager.h',
52 'layer_animation_sequence.cc', 52 'layer_animation_sequence.cc',
53 'layer_animation_sequence.h', 53 'layer_animation_sequence.h',
54 'layer_animator.cc', 54 'layer_animator.cc',
55 'layer_animator.h', 55 'layer_animator.h',
56 ], 56 ],
57 'conditions': [ 57 'conditions': [
58 ['os_posix == 1 and OS != "mac"', { 58 ['os_posix == 1 and OS != "mac"', {
59 'sources!': [ 59 'sources!': [
60 'compositor_stub.cc', 60 'compositor_stub.cc',
61 ], 61 ],
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 'layer_animation_element_unittest.cc', 103 'layer_animation_element_unittest.cc',
104 'layer_animation_sequence_unittest.cc', 104 'layer_animation_sequence_unittest.cc',
105 'layer_animator_unittest.cc', 105 'layer_animator_unittest.cc',
106 'layer_unittest.cc', 106 'layer_unittest.cc',
107 'run_all_unittests.cc', 107 'run_all_unittests.cc',
108 'test_compositor.cc', 108 'test_compositor.cc',
109 'test_compositor.h', 109 'test_compositor.h',
110 'test_compositor_host.h', 110 'test_compositor_host.h',
111 'test_compositor_host_linux.cc', 111 'test_compositor_host_linux.cc',
112 'test_compositor_host_win.cc', 112 'test_compositor_host_win.cc',
113 'test_layer_animation_delegate.cc',
114 'test_layer_animation_delegate.h',
115 'test_suite.cc', 113 'test_suite.cc',
116 'test_suite.h', 114 'test_suite.h',
117 'test_texture.cc', 115 'test_texture.cc',
118 'test_texture.h', 116 'test_texture.h',
119 'test_utils.cc', 117 'test_utils.cc',
120 'test_utils.h', 118 'test_utils.h',
121 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 119 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
122 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 120 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
123 ], 121 ],
124 'conditions': [ 122 'conditions': [
125 # osmesa GL implementation is used on linux. 123 # osmesa GL implementation is used on linux.
126 ['OS=="linux"', { 124 ['OS=="linux"', {
127 'dependencies': [ 125 'dependencies': [
128 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 126 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
129 ], 127 ],
130 }], 128 }],
131 ['OS!="mac"', { 129 ['OS!="mac"', {
132 'dependencies': [ 130 'dependencies': [
133 '<(DEPTH)/chrome/chrome.gyp:packed_resources', 131 '<(DEPTH)/chrome/chrome.gyp:packed_resources',
134 ], 132 ],
135 }], 133 }],
136 ], 134 ],
137 }, 135 },
138 ], 136 ],
139 } 137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698