Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 72 insertions, 20 deletions

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 49320fc..f5d03c4 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -105,21 +105,12 @@
       ],
     },
     {
-      'target_name': 'glue',
+      'target_name': 'webkit_user_agent',
       'type': '<(library)',
-      'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
+      'msvs_guid': 'DB162DE1-7D56-4C4A-8A9F-80D396CD7AA8',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
         '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/printing/printing.gyp:printing',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
-        '<(DEPTH)/third_party/ppapi/ppapi.gyp:ppapi_c',
-        'webkit_resources',
-        'webkit_strings',
       ],
       'actions': [
         {
@@ -136,14 +127,46 @@
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
+      ],
+      'sources': [
+        'user_agent.cc',
+        'user_agent.h',
+      ],
+      # Dependents may rely on files generated by this target or one of its
+      # own hard dependencies.
+      'hard_dependency': 1,
+      'conditions': [
+      ],
+    },
+    {
+      'target_name': 'glue',
+      'type': '<(library)',
+      'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
+      'dependencies': [
+        '<(DEPTH)/app/app.gyp:app_base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/printing/printing.gyp:printing',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+        '<(DEPTH)/third_party/ppapi/ppapi.gyp:ppapi_c',
+        'webkit_resources',
+        'webkit_strings',
+        'webkit_user_agent',
+      ],
+      'actions': [
+      ],
+      'include_dirs': [
+        '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
       ],
       'sources': [
         # This list contains all .h, .cc, and .mm files in glue except for
         # those in the test subdirectory and those with unittest in in their
         # names.
-        'devtools_message_data.cc',
-        'devtools_message_data.h',
         'media/buffered_data_source.cc',
         'media/buffered_data_source.h',
         'media/media_resource_loader_bridge_factory.cc',
@@ -164,12 +187,18 @@
         'plugins/gtk_plugin_container_manager.cc',
         'plugins/npapi_extension_thunk.cc',
         'plugins/npapi_extension_thunk.h',
+        'plugins/pepper_audio.cc',
+        'plugins/pepper_audio.h',
         'plugins/pepper_buffer.cc',
         'plugins/pepper_buffer.h',
-        'plugins/pepper_device_context_2d.cc',
-        'plugins/pepper_device_context_2d.h',
+        'plugins/pepper_char_set.cc',
+        'plugins/pepper_char_set.h',
+        'plugins/pepper_cursor_control.cc',
+        '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_event_conversion.cc',
         'plugins/pepper_event_conversion.h',
         'plugins/pepper_file_chooser.cc',
@@ -182,6 +211,8 @@
         'plugins/pepper_file_system.h',
         'plugins/pepper_font.cc',
         'plugins/pepper_font.h',
+        'plugins/pepper_graphics_2d.cc',
+        'plugins/pepper_graphics_2d.h',
         'plugins/pepper_image_data.cc',
         'plugins/pepper_image_data.h',
         'plugins/pepper_plugin_delegate.h',
@@ -189,22 +220,32 @@
         'plugins/pepper_plugin_instance.h',
         'plugins/pepper_plugin_module.cc',
         'plugins/pepper_plugin_module.h',
+        'plugins/pepper_plugin_object.cc',
+        'plugins/pepper_plugin_object.h',
         'plugins/pepper_private.cc',
         'plugins/pepper_private.h',
+        'plugins/pepper_private2.cc',
+        'plugins/pepper_private2.h',
         '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_transport.cc',
+        'plugins/pepper_transport.h',
         'plugins/pepper_url_loader.cc',
         'plugins/pepper_url_loader.h',
         'plugins/pepper_url_request_info.cc',
         'plugins/pepper_url_request_info.h',
         'plugins/pepper_url_response_info.cc',
         'plugins/pepper_url_response_info.h',
+        'plugins/pepper_url_util.cc',
+        'plugins/pepper_url_util.h',
         'plugins/pepper_var.cc',
         'plugins/pepper_var.h',
+        'plugins/pepper_video_decoder.cc',
+        'plugins/pepper_video_decoder.h',
         'plugins/pepper_webplugin_impl.cc',
         'plugins/pepper_webplugin_impl.h',
         'plugins/pepper_widget.cc',
@@ -258,6 +299,7 @@
         'plugins/webplugininfo.h',
         'alt_error_page_resource_fetcher.cc',
         'alt_error_page_resource_fetcher.h',
+        'context_menu.cc',
         'context_menu.h',
         'cpp_binding_example.cc',
         'cpp_binding_example.h',
@@ -267,6 +309,7 @@
         'cpp_variant.h',
         'dom_operations.cc',
         'dom_operations.h',
+        'form_data.cc',
         'form_data.h',
         'form_field.cc',
         'form_field.h',
@@ -274,6 +317,8 @@
         'ftp_directory_listing_response_delegate.h',
         'glue_serialize.cc',
         'glue_serialize.h',
+        'idb_bindings.cc',
+        'idb_bindings.h',
         'image_decoder.cc',
         'image_decoder.h',
         'image_resource_fetcher.cc',
@@ -282,6 +327,7 @@
         'multipart_response_delegate.h',
         'npruntime_util.cc',
         'npruntime_util.h',
+        'password_form.cc',
         'password_form.h',
         'password_form_dom_manager.cc',
         'password_form_dom_manager.h',
@@ -299,6 +345,7 @@
         'webaccessibility.h',
         'webclipboard_impl.cc',
         'webclipboard_impl.h',
+        'webcookie.cc',
         'webcookie.h',
         'webcursor.cc',
         'webcursor.h',
@@ -309,8 +356,8 @@
         'webdropdata.cc',
         'webdropdata_win.cc',
         'webdropdata.h',
-        'webfilesystem_impl.cc',
-        'webfilesystem_impl.h',
+        'webfileutilities_impl.cc',
+        'webfileutilities_impl.h',
         'webkit_glue.cc',
         'webkit_glue.h',
         'webkitclient_impl.cc',
@@ -331,6 +378,8 @@
         'webthemeengine_impl_win.cc',
         'weburlloader_impl.cc',
         'weburlloader_impl.h',
+        'webvideoframe_impl.cc',
+        'webvideoframe_impl.h',
         'window_open_disposition.h',
         'window_open_disposition.cc',
 
@@ -344,8 +393,6 @@
         '../extensions/v8/gears_extension.h',
         '../extensions/v8/heap_profiler_extension.cc',
         '../extensions/v8/heap_profiler_extension.h',
-        '../extensions/v8/interval_extension.cc',
-        '../extensions/v8/interval_extension.h',
         '../extensions/v8/playback_extension.cc',
         '../extensions/v8/playback_extension.h',
         '../extensions/v8/profiler_extension.cc',
@@ -375,11 +422,16 @@
           'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
           'link_settings': {
             'libraries': [
-              '$(SDKROOT)/QuartzCore.framework',
+              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
             ],
           },
         }],
         ['enable_gpu==1 and inside_chromium_build==1', {
+          'sources': [
+            'plugins/pepper_graphics_3d_gl.cc',
+            'plugins/pepper_graphics_3d.cc',
+            'plugins/pepper_graphics_3d.h',
+          ],
           'dependencies': [
             '<(DEPTH)/gpu/gpu.gyp:gpu_plugin',
           ],