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

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

Issue 9813017: aura: Enable use_canvas_skia=1 on aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comment in common.gypi. Created 8 years, 9 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') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 'conditions': [ 56 'conditions': [
57 ['OS == "win" and use_aura == 1', { 57 ['OS == "win" and use_aura == 1', {
58 # TODO(sky): before we make this real need to remove 58 # TODO(sky): before we make this real need to remove
59 # IDR_BITMAP_BRUSH_IMAGE. 59 # IDR_BITMAP_BRUSH_IMAGE.
60 'dependencies': [ 60 'dependencies': [
61 '<(DEPTH)/ui/ui.gyp:gfx_resources', 61 '<(DEPTH)/ui/ui.gyp:gfx_resources',
62 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL', 62 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',
63 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2', 63 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
64 ], 64 ],
65 }], 65 }],
66 ['use_canvas_skia==1', {
67 'defines': [
68 'PER_TILE_PAINTING',
69 ],
70 }],
71 ], 66 ],
72 }, 67 },
73 { 68 {
74 'target_name': 'compositor_test_support', 69 'target_name': 'compositor_test_support',
75 'type': 'static_library', 70 'type': 'static_library',
76 'dependencies': [ 71 'dependencies': [
77 '<(DEPTH)/base/base.gyp:base', 72 '<(DEPTH)/base/base.gyp:base',
78 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support', 73 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
79 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 74 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
80 ], 75 ],
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 # osmesa GL implementation is used on linux. 127 # osmesa GL implementation is used on linux.
133 ['OS=="linux"', { 128 ['OS=="linux"', {
134 'dependencies': [ 129 'dependencies': [
135 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 130 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
136 ], 131 ],
137 }], 132 }],
138 ], 133 ],
139 }, 134 },
140 ], 135 ],
141 } 136 }
OLDNEW
« no previous file with comments | « ui/gfx/compositor/compositor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698