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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl_tests.gyp

Issue 1354483004: Re-land: ui: Add GLImage unit test framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: deps fix Created 5 years, 3 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
« ui/gl/gl_image_shared_memory.h ('K') | « ui/gl/gl_surface_glx.cc ('k') | ui/gl/test/gl_image_test_support.h » ('j') | ui/gl/test/gl_image_test_template.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_tests.gyp
diff --git a/ui/gl/gl_tests.gyp b/ui/gl/gl_tests.gyp
index 4f7e2dd865626505637a4e4c7af3754454b969a0..efce4a3595fc0a48a2bbd634380d3a2180b195d0 100644
--- a/ui/gl/gl_tests.gyp
+++ b/ui/gl/gl_tests.gyp
@@ -14,6 +14,8 @@
'test/run_all_unittests.cc',
'gpu_timing_unittest.cc',
'gl_api_unittest.cc',
+ 'gl_image_ref_counted_memory_unittest.cc',
+ 'gl_image_shared_memory_unittest.cc',
],
'include_dirs': [
'<(DEPTH)/third_party/khronos',
@@ -21,8 +23,10 @@
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:test_support_base',
+ '<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/gl/gl.gyp:gl_test_support',
'<(DEPTH)/ui/gl/gl.gyp:gl_unittest_utils',
« ui/gl/gl_image_shared_memory.h ('K') | « ui/gl/gl_surface_glx.cc ('k') | ui/gl/test/gl_image_test_support.h » ('j') | ui/gl/test/gl_image_test_template.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698