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

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

Issue 11453012: Fix black background when locking with fullscreen window: (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rename undo/stop to cancel Created 8 years 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
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL', 65 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',
66 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2', 66 '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
67 ], 67 ],
68 }], 68 }],
69 ], 69 ],
70 }, 70 },
71 { 71 {
72 'target_name': 'compositor_test_support', 72 'target_name': 'compositor_test_support',
73 'type': 'static_library', 73 'type': 'static_library',
74 'dependencies': [ 74 'dependencies': [
75 'compositor',
76 '<(DEPTH)/ui/ui.gyp:ui_test_support',
75 '<(DEPTH)/base/base.gyp:base', 77 '<(DEPTH)/base/base.gyp:base',
76 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support', 78 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
77 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 79 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
78 ], 80 ],
79 'sources': [ 81 'sources': [
80 'test/compositor_test_support.cc', 82 'test/compositor_test_support.cc',
81 'test/compositor_test_support.h', 83 'test/compositor_test_support.h',
82 ], 84 ],
83 'conditions': [ 85 'conditions': [
84 ['os_posix == 1 and OS != "mac"', { 86 ['os_posix == 1 and OS != "mac"', {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 # osmesa GL implementation is used on linux. 133 # osmesa GL implementation is used on linux.
132 ['OS=="linux"', { 134 ['OS=="linux"', {
133 'dependencies': [ 135 'dependencies': [
134 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 136 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
135 ], 137 ],
136 }], 138 }],
137 ], 139 ],
138 }, 140 },
139 ], 141 ],
140 } 142 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698