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

Unified Diff: gpu/gpu.gyp

Issue 14456004: GPU client side changes for GpuMemoryBuffers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@glapi
Patch Set: Updated the extension documentation Created 7 years, 7 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
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 04925322308b7232d5c7db5d0f8943f9b50fb02a..09848de2831b79c618693930a3b1a3a279791830 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -16,6 +16,7 @@
'type': '<(component)',
'dependencies': [
'../base/base.gyp:base',
+ '../testing/gmock.gyp:gmock',
greggman 2013/05/10 00:12:22 Mock should not be here. Mock is only used in unit
kaanb 2013/05/13 23:00:36 Done.
'../third_party/khronos/khronos.gyp:khronos_headers',
'../ui/gl/gl.gyp:gl',
'command_buffer/command_buffer.gyp:gles2_utils',
@@ -40,6 +41,7 @@
],
'dependencies': [
'../base/base.gyp:base',
+ '../testing/gmock.gyp:gmock',
greggman 2013/05/10 00:12:22 Mock should not be here. Mock is only used in unit
kaanb 2013/05/13 23:00:36 Done.
'../third_party/khronos/khronos.gyp:khronos_headers',
'../ui/gl/gl.gyp:gl',
'command_buffer/command_buffer.gyp:gles2_utils',
@@ -62,6 +64,7 @@
],
'dependencies': [
'../base/base.gyp:base',
+ '../testing/gmock.gyp:gmock',
greggman 2013/05/10 00:12:22 Mock should not be here. Mock is only used in unit
kaanb 2013/05/13 23:00:36 Done.
'../third_party/khronos/khronos.gyp:khronos_headers',
'command_buffer/command_buffer.gyp:gles2_utils',
'gles2_cmd_helper',
@@ -247,6 +250,7 @@
'command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc',
'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc',
'command_buffer/tests/gl_depth_texture_unittest.cc',
+ 'command_buffer/tests/gl_gpu_memory_buffer_unittests.cc',
'command_buffer/tests/gl_lose_context_chromium_unittests.cc',
'command_buffer/tests/gl_manager.cc',
'command_buffer/tests/gl_manager.h',

Powered by Google App Engine
This is Rietveld 408576698