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

Unified Diff: webkit/glue/webkit_glue.gypi

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 | « webkit/compositor_bindings/web_compositor_support_impl.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 6c7a448e30e8937853519282478c049be068ad17..4385667bf1d4eedd72b65d48e6d8a739e0d04d1c 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -11,6 +11,8 @@
'webkit_src_dir': '../../third_party/WebKit',
}],
],
+
+ 'use_libcc_for_compositor%': 0,
},
'target_defaults': {
# Disable narrowing-conversion-in-initialization-list warnings in that we
@@ -140,6 +142,7 @@
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'blob',
'fileapi',
@@ -520,6 +523,7 @@
'sources!': [
'plugins/plugin_stubs.cc',
],
+ 'msvs_disabled_warnings': [ 4800 ],
'conditions': [
['inside_chromium_build==1 and component=="shared_library"', {
'dependencies': [
@@ -537,6 +541,11 @@
'<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
],
}],
+ ['use_libcc_for_compositor==1', {
+ 'defines': [
+ 'USE_LIBCC_FOR_COMPOSITOR',
+ ],
+ }],
],
},
],
« no previous file with comments | « webkit/compositor_bindings/web_compositor_support_impl.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698