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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_tests.gypi

Issue 8805033: Makes tests either use mock compositor or mock WebGraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 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
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | content/test/content_test_suite.cc » ('j') | ui/gfx/compositor/compositor_setup.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index b77ac4d2461efe1bafc3a942b277252b781df540..1fd625ac88e60b281aa989d9e6c89aa609111be4 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -21,7 +21,6 @@
'../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
'../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
- '../ui/gfx/compositor/compositor.gyp:test_compositor',
'../ui/gfx/surface/surface.gyp:surface',
'../ui/ui.gyp:ui_test_support',
'../webkit/support/webkit_support.gyp:appcache',
@@ -121,6 +120,15 @@
'../build/linux/system.gyp:glib',
],
}],
+ ['views_compositor==1 and use_webkit_compositor==1', {
jonathan.backer 2011/12/07 16:57:20 why views_compositor==1? AFAIK (maybe not GYP enf
+ 'dependencies': [
+ '../ui/gfx/compositor/compositor.gyp:compositor',
+ ],
+ }, {
+ 'dependencies': [
+ '../ui/gfx/compositor/compositor.gyp:test_compositor',
+ ],
+ }],
],
},
{
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | content/test/content_test_suite.cc » ('j') | ui/gfx/compositor/compositor_setup.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698