diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /webkit/glue/webkit_glue.gypi | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'webkit/glue/webkit_glue.gypi')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index f5d03c4..8249fb5 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -197,10 +197,12 @@ 'plugins/pepper_cursor_control.h', 'plugins/pepper_directory_reader.cc', 'plugins/pepper_directory_reader.h', - 'plugins/pepper_error_util.cc', - 'plugins/pepper_error_util.h', + 'plugins/pepper_error_util.cc', + 'plugins/pepper_error_util.h', 'plugins/pepper_event_conversion.cc', 'plugins/pepper_event_conversion.h', + 'plugins/pepper_file_callbacks.cc', + 'plugins/pepper_file_callbacks.h', 'plugins/pepper_file_chooser.cc', 'plugins/pepper_file_chooser.h', 'plugins/pepper_file_io.cc', @@ -226,12 +228,15 @@ 'plugins/pepper_private.h', 'plugins/pepper_private2.cc', 'plugins/pepper_private2.h', + 'plugins/pepper_private2_linux.cc', 'plugins/pepper_resource_tracker.cc', 'plugins/pepper_resource_tracker.h', 'plugins/pepper_resource.cc', 'plugins/pepper_resource.h', 'plugins/pepper_scrollbar.cc', 'plugins/pepper_scrollbar.h', + 'plugins/pepper_string.cc', + 'plugins/pepper_string.h', 'plugins/pepper_transport.cc', 'plugins/pepper_transport.h', 'plugins/pepper_url_loader.cc', @@ -251,6 +256,8 @@ 'plugins/pepper_widget.cc', 'plugins/pepper_widget.h', 'plugins/plugin_constants_win.h', + 'plugins/plugin_group.cc', + 'plugins/plugin_group.h', 'plugins/plugin_host.cc', 'plugins/plugin_host.h', 'plugins/plugin_instance.cc', @@ -288,6 +295,7 @@ 'plugins/webplugin.h', 'plugins/webplugin_2d_device_delegate.h', 'plugins/webplugin_3d_device_delegate.h', + 'plugins/webplugin_accelerated_surface_mac.h', 'plugins/webplugin_delegate.h', 'plugins/webplugin_delegate_impl.cc', 'plugins/webplugin_delegate_impl.h', @@ -296,6 +304,7 @@ 'plugins/webplugin_delegate_impl_win.cc', 'plugins/webplugin_impl.cc', 'plugins/webplugin_impl.h', + 'plugins/webplugininfo.cc', 'plugins/webplugininfo.h', 'alt_error_page_resource_fetcher.cc', 'alt_error_page_resource_fetcher.h', @@ -345,6 +354,8 @@ 'webaccessibility.h', 'webclipboard_impl.cc', 'webclipboard_impl.h', + 'web_io_operators.cc', + 'web_io_operators.h', 'webcookie.cc', 'webcookie.h', 'webcursor.cc', @@ -375,6 +386,7 @@ 'websocketstreamhandle_delegate.h', 'websocketstreamhandle_impl.cc', 'websocketstreamhandle_impl.h', + 'webthemeengine_impl_linux.cc', 'webthemeengine_impl_win.cc', 'weburlloader_impl.cc', 'weburlloader_impl.h', @@ -426,7 +438,7 @@ ], }, }], - ['enable_gpu==1 and inside_chromium_build==1', { + ['enable_gpu==1', { 'sources': [ 'plugins/pepper_graphics_3d_gl.cc', 'plugins/pepper_graphics_3d.cc', @@ -458,6 +470,10 @@ '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', ], + 'export_dependent_settings': [ + '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', + ], }], ], }], |