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

Unified Diff: webkit/common/gpu/webkit_gpu.gyp

Issue 26315004: Remove the use_angle_translator condition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/gpu.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/common/gpu/webkit_gpu.gyp
diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp
index d85e4781aaf493983708c345231a407f0eb3ef08..86f7e43022bf3ef30e4812cf7db4bf58952cd37c 100644
--- a/webkit/common/gpu/webkit_gpu.gyp
+++ b/webkit/common/gpu/webkit_gpu.gyp
@@ -23,6 +23,7 @@
'<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
+ '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/ui.gyp:ui',
@@ -47,17 +48,6 @@
'defines': [
'WEBKIT_GPU_IMPLEMENTATION',
],
- 'conditions': [
- ['use_angle_translator==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
- ],
- }, {
- 'dependencies': [
- '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
- ],
- }],
- ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
},
« no previous file with comments | « gpu/gpu.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698