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

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

Issue 7273073: Animated Rotation (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Address reviewer comments Created 9 years, 3 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_gl.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 21 matching lines...) Expand all
32 ], 32 ],
33 'defines': [ 33 'defines': [
34 'COMPOSITOR_IMPLEMENTATION', 34 'COMPOSITOR_IMPLEMENTATION',
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',
43 'compositor_stub.cc',
42 'compositor_win.cc', 44 'compositor_win.cc',
43 'layer.cc', 45 'layer.cc',
44 'layer.h', 46 'layer.h',
45 'layer_animator.cc', 47 'layer_animator.cc',
46 'layer_animator.h', 48 'layer_animator.h',
47 ], 49 ],
48 'conditions': [ 50 'conditions': [
49 ['os_posix == 1 and OS != "mac"', { 51 ['os_posix == 1 and OS != "mac"', {
50 'sources!': [ 52 'sources!': [
51 'compositor.cc', 53 'compositor_stub.cc',
52 ], 54 ],
53 }], 55 }],
54 ['OS == "win" and views_compositor == 1', { 56 ['OS == "win" and views_compositor == 1', {
55 'sources!': [ 57 'sources!': [
56 'compositor.cc', 58 'compositor_stub.cc',
57 ], 59 ],
58 # TODO(sky): before we make this real need to remove 60 # TODO(sky): before we make this real need to remove
59 # IDR_BITMAP_BRUSH_IMAGE. 61 # IDR_BITMAP_BRUSH_IMAGE.
60 'dependencies': [ 62 'dependencies': [
61 '<(DEPTH)/ui/ui.gyp:gfx_resources', 63 '<(DEPTH)/ui/ui.gyp:gfx_resources',
62 ], 64 ],
63 'link_settings': { 65 'link_settings': {
64 'libraries': [ 66 'libraries': [
65 '-ld3d10.lib', 67 '-ld3d10.lib',
66 '-ld3dx10d.lib', 68 '-ld3dx10d.lib',
67 '-ldxerr.lib', 69 '-ldxerr.lib',
68 '-ldxguid.lib', 70 '-ldxguid.lib',
69 ] 71 ]
70 }, 72 },
71 }], 73 }],
72 ['OS == "win" and views_compositor == 0', { 74 ['OS == "win" and views_compositor == 0', {
73 'sources/': [ 75 'sources/': [
74 ['exclude', '^compositor_win.cc'], 76 ['exclude', '^compositor_win.cc'],
75 ], 77 ],
76 }], 78 }],
77 ], 79 ],
78 }, 80 },
79 81
80 { 82 {
81 'target_name': 'compositor_unittests', 83 'target_name': 'compositor_unittests',
82 'type': 'executable', 84 'type': 'executable',
83 'dependencies': [ 85 'dependencies': [
84 '<(DEPTH)/base/base.gyp:base', 86 '<(DEPTH)/base/base.gyp:base',
85 '<(DEPTH)/base/base.gyp:test_support_base', 87 '<(DEPTH)/base/base.gyp:test_support_base',
86 '<(DEPTH)/skia/skia.gyp:skia', 88 '<(DEPTH)/skia/skia.gyp:skia',
87 '<(DEPTH)/testing/gtest.gyp:gtest', 89 '<(DEPTH)/testing/gtest.gyp:gtest',
88 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 90 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
89 '<(DEPTH)/ui/ui.gyp:gfx_resources', 91 '<(DEPTH)/ui/ui.gyp:gfx_resources',
90 '<(DEPTH)/ui/ui.gyp:ui', 92 '<(DEPTH)/ui/ui.gyp:ui',
91 '<(DEPTH)/ui/ui.gyp:ui_resources', 93 '<(DEPTH)/ui/ui.gyp:ui_resources',
92 'compositor', 94 'compositor',
93 ], 95 ],
94 'sources': [ 96 'sources': [
95 'layer_unittest.cc', 97 'layer_unittest.cc',
96 'run_all_unittests.cc', 98 'run_all_unittests.cc',
97 'test_compositor_host.h', 99 'test_compositor_host.h',
98 'test_compositor_host_win.cc', 100 'test_compositor_host_win.cc',
99 'test_suite.cc', 101 'test_suite.cc',
100 'test_suite.h', 102 'test_suite.h',
101 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 103 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
102 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 104 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
103 ], 105 ],
104 }, 106 },
105 107
106 ], 108 ],
107 } 109 }
OLDNEW
« no previous file with comments | « ui/gfx/compositor/compositor.cc ('k') | ui/gfx/compositor/compositor_gl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698