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

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

Issue 8222028: Use WebKit compositor in ui::Layer (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase 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
« no previous file with comments | « ui/gfx/compositor/compositor.cc ('k') | ui/gfx/compositor/compositor_cc.h » ('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) 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 11 matching lines...) Expand all
22 'targets': [ 22 'targets': [
23 { 23 {
24 'target_name': 'compositor', 24 'target_name': 'compositor',
25 'type': '<(component)', 25 'type': '<(component)',
26 'dependencies': [ 26 'dependencies': [
27 '<(DEPTH)/base/base.gyp:base', 27 '<(DEPTH)/base/base.gyp:base',
28 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 28 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
29 '<(DEPTH)/skia/skia.gyp:skia', 29 '<(DEPTH)/skia/skia.gyp:skia',
30 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 30 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
31 '<(DEPTH)/ui/ui.gyp:ui', 31 '<(DEPTH)/ui/ui.gyp:ui',
32 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
32 ], 33 ],
33 'defines': [ 34 'defines': [
34 'COMPOSITOR_IMPLEMENTATION', 35 'COMPOSITOR_IMPLEMENTATION',
35 ], 36 ],
36 'sources': [ 37 'sources': [
37 'compositor.cc', 38 'compositor.cc',
38 'compositor.h', 39 'compositor.h',
39 'compositor_export.h', 40 'compositor_export.h',
40 'compositor_gl.cc', 41 'compositor_gl.cc',
41 'compositor_gl.h', 42 'compositor_gl.h',
43 'compositor_cc.cc',
44 'compositor_cc.h',
42 'compositor_observer.h', 45 'compositor_observer.h',
43 'compositor_stub.cc', 46 'compositor_stub.cc',
44 'compositor_win.cc', 47 'compositor_win.cc',
45 'layer.cc', 48 'layer.cc',
46 'layer.h', 49 'layer.h',
47 'layer_animator.cc', 50 'layer_animator.cc',
48 'layer_animator.h', 51 'layer_animator.h',
49 'layer_animator_delegate.h', 52 'layer_animator_delegate.h',
50 ], 53 ],
51 'conditions': [ 54 'conditions': [
(...skipping 18 matching lines...) Expand all
70 '-ldxerr.lib', 73 '-ldxerr.lib',
71 '-ldxguid.lib', 74 '-ldxguid.lib',
72 ] 75 ]
73 }, 76 },
74 }], 77 }],
75 ['OS == "win" and views_compositor == 0', { 78 ['OS == "win" and views_compositor == 0', {
76 'sources/': [ 79 'sources/': [
77 ['exclude', '^compositor_win.cc'], 80 ['exclude', '^compositor_win.cc'],
78 ], 81 ],
79 }], 82 }],
83 ['use_webkit_compositor == 1', {
84 'sources/': [
85 ['exclude', '^compositor_(gl|win|stub).(h|cc)$'],
86 ],
87 'dependencies': [
88 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
89 ],
90 }, {
91 'sources!': [
92 'compositor_cc.cc',
93 'compositor_cc.h',
94 ],
95 }
96 ],
97 ],
98 },
99 {
100 'target_name': 'compositor_test_support',
101 'type': 'static_library',
102 'dependencies': [
103 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
104 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
105 ],
106 'sources': [
107 'compositor_test_support.cc',
108 'compositor_test_support.h',
109 ],
110 'conditions': [
111 ['use_webkit_compositor == 1', {
112 'dependencies': [
113 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
114 ],
115 }],
80 ], 116 ],
81 }, 117 },
82 { 118 {
83 'target_name': 'compositor_unittests', 119 'target_name': 'compositor_unittests',
84 'type': 'executable', 120 'type': 'executable',
85 'dependencies': [ 121 'dependencies': [
86 '<(DEPTH)/base/base.gyp:base', 122 '<(DEPTH)/base/base.gyp:base',
87 '<(DEPTH)/base/base.gyp:test_support_base', 123 '<(DEPTH)/base/base.gyp:test_support_base',
88 '<(DEPTH)/skia/skia.gyp:skia', 124 '<(DEPTH)/skia/skia.gyp:skia',
89 '<(DEPTH)/testing/gtest.gyp:gtest', 125 '<(DEPTH)/testing/gtest.gyp:gtest',
90 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 126 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
91 '<(DEPTH)/ui/ui.gyp:gfx_resources', 127 '<(DEPTH)/ui/ui.gyp:gfx_resources',
92 '<(DEPTH)/ui/ui.gyp:ui', 128 '<(DEPTH)/ui/ui.gyp:ui',
93 '<(DEPTH)/ui/ui.gyp:ui_resources', 129 '<(DEPTH)/ui/ui.gyp:ui_resources',
94 'compositor', 130 'compositor',
131 'compositor_test_support',
95 ], 132 ],
96 'sources': [ 133 'sources': [
97 'layer_unittest.cc', 134 'layer_unittest.cc',
98 'run_all_unittests.cc', 135 'run_all_unittests.cc',
99 'test_compositor.cc', 136 'test_compositor.cc',
100 'test_compositor.h', 137 'test_compositor.h',
101 'test_compositor_host.h', 138 'test_compositor_host.h',
102 'test_compositor_host_linux.cc', 139 'test_compositor_host_linux.cc',
103 'test_compositor_host_win.cc', 140 'test_compositor_host_win.cc',
104 'test_suite.cc', 141 'test_suite.cc',
(...skipping 12 matching lines...) Expand all
117 }], 154 }],
118 ['OS!="mac"', { 155 ['OS!="mac"', {
119 'dependencies': [ 156 'dependencies': [
120 '<(DEPTH)/chrome/chrome.gyp:packed_resources', 157 '<(DEPTH)/chrome/chrome.gyp:packed_resources',
121 ], 158 ],
122 }], 159 }],
123 ], 160 ],
124 }, 161 },
125 ], 162 ],
126 } 163 }
OLDNEW
« no previous file with comments | « ui/gfx/compositor/compositor.cc ('k') | ui/gfx/compositor/compositor_cc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698