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

Unified Diff: cc/cc.gyp

Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge fix Created 8 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
Index: cc/cc.gyp
diff --git a/cc/cc.gyp b/cc/cc.gyp
index fcc30d9d4f0a0ac5603eb27a382314840dd0db49..91084257908f824d522c98bd23cf02d6c94cfe4c 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -36,6 +36,8 @@
'CCDelayBasedTimeSource.h',
'CCDelegatedRendererLayerImpl.cpp',
'CCDelegatedRendererLayerImpl.h',
+ 'CCDelegatingRenderer.cpp',
+ 'CCDelegatingRenderer.h',
'CCDirectRenderer.cpp',
'CCDirectRenderer.h',
'CCDrawQuad.cpp',
@@ -280,5 +282,36 @@
}],
],
},
+ {
+ 'target_name': 'cc_ipc',
+ 'type': 'static_library',
+ 'includes': [
+ 'cc.gypi',
+ ],
+ 'conditions': [
+ ['use_libcc_for_compositor==1', {
+ 'dependencies': [
+ 'cc',
+ '<(DEPTH)/ipc/ipc.gyp:ipc',
+ '<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/ui/ui.gyp:ui',
+ '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+ ],
+ 'defines': [
+ 'WTF_USE_ACCELERATED_COMPOSITING=1',
+ ],
+ 'include_dirs': [
+ '<(webkit_src_dir)/Source/Platform/chromium',
+ '<@(cc_stubs_dirs)',
+ ],
+ 'sources': [
+ 'ipc/cc_param_traits.h',
+ 'ipc/cc_param_traits.cc',
+ 'ipc/cc_render_pass_traits.h',
+ 'ipc/cc_render_pass_traits.cc',
+ ],
+ }],
+ ],
+ },
],
}
« no previous file with comments | « cc/TreeSynchronizer.cpp ('k') | cc/ipc/cc_param_traits.h » ('j') | cc/transferable_resource.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698