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

Unified Diff: cc/cc_tests.gyp

Issue 11412289: Basic pixel tests for cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moves png comparison code to cc/test, does actual comparison 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 side-by-side diff with in-line comments
Download patch
Index: cc/cc_tests.gyp
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index bdc68ff97962ea70076ace0fb12557fba3c625ad..a5e3eee2df29bdcd4e713c99e58fce8a329d69aa 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -16,6 +16,7 @@
'float_quad_unittest.cc',
'frame_rate_controller_unittest.cc',
'gl_renderer_unittest.cc',
+ 'gl_renderer_pixeltest.cc',
'hash_pair_unittest.cc',
'heads_up_display_unittest.cc',
'keyframed_animation_curve_unittest.cc',
@@ -85,6 +86,8 @@
'test/mock_quad_culler.cc',
'test/mock_quad_culler.h',
'test/occlusion_tracker_test_common.h',
+ 'test/pixel_test_graphics_context.cc',
+ 'test/pixel_test_graphics_context.h',
'test/render_pass_test_common.cc',
'test/render_pass_test_common.h',
'test/scheduler_test_common.cc',
@@ -104,8 +107,10 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../ui/ui.gyp:ui',
+ '../webkit/support/webkit_support.gyp:webkit_gpu',
'cc.gyp:cc',
'cc_test_support',
+ 'cc_test_utils',
],
'sources': [
'test/run_all_unittests.cc',
@@ -164,16 +169,32 @@
'../third_party/WebKit/Source/Platform/chromium',
],
'dependencies': [
- '../ui/gl/gl.gyp:gl',
- '../testing/gtest.gyp:gtest',
- '../testing/gmock.gyp:gmock',
'../skia/skia.gyp:skia',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '../third_party/mesa/mesa.gyp:osmesa',
+ '../ui/gl/gl.gyp:gl',
],
'sources': [
'<@(cc_tests_support_files)',
],
},
+ {
+ 'target_name': 'cc_test_utils',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '..'
+ ],
+ 'sources': [
+ 'test/pixel_test_utils.cc',
+ 'test/pixel_test_utils.h',
+ ],
+ 'dependencies': [
+ '../skia/skia.gyp:skia',
+ '../ui/ui.gyp:ui', # for png_codec
+ ],
+ },
],
'conditions': [
# Special target to wrap a gtest_target_type==shared_library

Powered by Google App Engine
This is Rietveld 408576698