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

Unified Diff: webkit/compositor_bindings/compositor_bindings.gyp

Issue 10918037: Implementation of WebCompositorSupport when use_libcc_for_compositor=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ignore c4800 in webkit_glue Created 8 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
« no previous file with comments | « no previous file | webkit/compositor_bindings/web_compositor_support_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/compositor_bindings.gyp
diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp
index 5536de036e572ff8b07a0da8081d32d1fe2cb04c..77f27055c94b8bf6b7e28715f8d2f14a4b7dde7b 100644
--- a/webkit/compositor_bindings/compositor_bindings.gyp
+++ b/webkit/compositor_bindings/compositor_bindings.gyp
@@ -44,7 +44,45 @@
'WebVideoLayerImpl.h',
'WheelFlingPlatformGestureCurve.h',
],
+ 'conditions': [
+ ['inside_chromium_build==0', {
+ 'webkit_src_dir': '../../../../..',
+ },{
+ 'webkit_src_dir': '../../third_party/WebKit',
+ }],
+ ],
+
+
},
+ 'targets': [
+ {
+ 'target_name': 'webkit_compositor_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../skia/skia.gyp:skia',
+ ],
+ 'sources': [
+ 'web_compositor_support_impl.cc',
+ 'web_compositor_support_impl.h',
+ ],
+ 'include_dirs': [
+ '../..',
+ '<(webkit_src_dir)/Source/Platform/chromium',
+ ],
+ 'conditions': [
+ ['use_libcc_for_compositor==1', {
+ 'include_dirs': [
+ '../../cc',
+ '../../cc/stubs',
+ ],
+ 'dependencies': [
+ 'webkit_compositor_bindings',
+ '../../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+ ],
+ }],
+ ],
+ },
+ ],
'conditions': [
['use_libcc_for_compositor==1', {
'targets': [
@@ -73,7 +111,7 @@
'stubs/AnimationIdVendor.h',
'stubs/public/WebTransformationMatrix',
],
- }
+ },
],
}],
],
« no previous file with comments | « no previous file | webkit/compositor_bindings/web_compositor_support_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698