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

Side by Side Diff: webkit/common/gpu/webkit_gpu.gyp

Issue 17904008: Fixing gpu_ipc_browsertests.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fix Created 7 years, 5 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 | « webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'conditions': [ 6 'conditions': [
7 # TODO(stuartmorgan): All dependencies from code built on iOS to 7 # TODO(stuartmorgan): All dependencies from code built on iOS to
8 # webkit/ should be removed, at which point this condition can be 8 # webkit/ should be removed, at which point this condition can be
9 # removed. 9 # removed.
10 ['OS != "ios"', { 10 ['OS != "ios"', {
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'webkit_gpu', 13 'target_name': 'webkit_gpu',
14 'type': '<(component)', 14 'type': '<(component)',
15 'variables': { 'enable_wexit_time_destructors': 1, }, 15 'variables': { 'enable_wexit_time_destructors': 1, },
16 'dependencies': [ 16 'dependencies': [
17 '<(DEPTH)/base/base.gyp:base', 17 '<(DEPTH)/base/base.gyp:base',
18 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations', 18 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations',
19 '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils',
19 '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', 20 '<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
20 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 21 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
21 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 22 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
22 '<(DEPTH)/skia/skia.gyp:skia', 23 '<(DEPTH)/skia/skia.gyp:skia',
23 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', 24 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
24 '<(angle_path)/src/build_angle.gyp:translator_glsl', 25 '<(angle_path)/src/build_angle.gyp:translator_glsl',
25 '<(DEPTH)/ui/gl/gl.gyp:gl', 26 '<(DEPTH)/ui/gl/gl.gyp:gl',
26 '<(DEPTH)/ui/ui.gyp:ui', 27 '<(DEPTH)/ui/ui.gyp:ui',
27 ], 28 ],
28 'sources': [ 29 'sources': [
(...skipping 14 matching lines...) Expand all
43 'defines': [ 44 'defines': [
44 'WEBKIT_GPU_IMPLEMENTATION', 45 'WEBKIT_GPU_IMPLEMENTATION',
45 ], 46 ],
46 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 47 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
47 'msvs_disabled_warnings': [ 4267, ], 48 'msvs_disabled_warnings': [ 4267, ],
48 }, 49 },
49 ], 50 ],
50 }], 51 }],
51 ], 52 ],
52 } 53 }
OLDNEW
« no previous file with comments | « webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698