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

Unified Diff: ui/gfx/compositor/compositor.gyp

Issue 8222028: Use WebKit compositor in ui::Layer (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase Created 9 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 | « ui/gfx/compositor/compositor.cc ('k') | ui/gfx/compositor/compositor_cc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor.gyp
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index d5e38b717cc5be34cd43db7c999aee139040bcc7..0b88f32feb27df62f5c62aa683275888d3c809af 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -29,6 +29,7 @@
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui',
+ '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'defines': [
'COMPOSITOR_IMPLEMENTATION',
@@ -39,6 +40,8 @@
'compositor_export.h',
'compositor_gl.cc',
'compositor_gl.h',
+ 'compositor_cc.cc',
+ 'compositor_cc.h',
'compositor_observer.h',
'compositor_stub.cc',
'compositor_win.cc',
@@ -77,6 +80,39 @@
['exclude', '^compositor_win.cc'],
],
}],
+ ['use_webkit_compositor == 1', {
+ 'sources/': [
+ ['exclude', '^compositor_(gl|win|stub).(h|cc)$'],
+ ],
+ 'dependencies': [
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
+ ],
+ }, {
+ 'sources!': [
+ 'compositor_cc.cc',
+ 'compositor_cc.h',
+ ],
+ }
+ ],
+ ],
+ },
+ {
+ 'target_name': 'compositor_test_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
+ '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+ ],
+ 'sources': [
+ 'compositor_test_support.cc',
+ 'compositor_test_support.h',
+ ],
+ 'conditions': [
+ ['use_webkit_compositor == 1', {
+ 'dependencies': [
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
+ ],
+ }],
],
},
{
@@ -92,6 +128,7 @@
'<(DEPTH)/ui/ui.gyp:ui',
'<(DEPTH)/ui/ui.gyp:ui_resources',
'compositor',
+ 'compositor_test_support',
],
'sources': [
'layer_unittest.cc',
« no previous file with comments | « ui/gfx/compositor/compositor.cc ('k') | ui/gfx/compositor/compositor_cc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698