Revert 212927 "Move webkitplatformsupport_impl and related from ..."

trunk/src/webkit/glue/webkit_glue.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
      # Disable narrowing-conversion-in-initialization-list warnings in that we
      # do not want to fix it in data file "webcursor_gtk_data.h".
      'cflags+': ['-Wno-narrowing'],
      'cflags_cc+': ['-Wno-narrowing'],
   },
   'targets': [
     {
       'target_name': 'glue_child',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'WEBKIT_CHILD_IMPLEMENTATION',
       ],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/base/base.gyp:base_static',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
         '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
         '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/url/url.gyp:url_lib',
-        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
-        '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
+
+        # TODO(scottmg): crbug.com/237249
+        'glue',
       ],
 
       'include_dirs': [
         # For JNI generated header.
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
       ],
-      'hard_dependency': 1,
 
       'sources': [
         '../child/fling_animator_impl_android.cc',
         '../child/fling_animator_impl_android.h',
         '../child/fling_curve_configuration.cc',
         '../child/fling_curve_configuration.h',
-        '../child/ftp_directory_listing_response_delegate.cc',
-        '../child/ftp_directory_listing_response_delegate.h',
-        '../child/multipart_response_delegate.cc',
-        '../child/multipart_response_delegate.h',
-        '../child/resource_loader_bridge.cc',
-        '../child/resource_loader_bridge.h',
         '../child/touch_fling_gesture_curve.cc',
         '../child/touch_fling_gesture_curve.h',
         '../child/web_discardable_memory_impl.cc',
         '../child/web_discardable_memory_impl.h',
         '../child/webfallbackthemeengine_impl.cc',
         '../child/webfallbackthemeengine_impl.h',
         '../child/webkit_child_export.h',
-        '../child/webkit_child_helpers.cc',
-        '../child/webkit_child_helpers.h',
         '../child/webkitplatformsupport_child_impl.cc',
         '../child/webkitplatformsupport_child_impl.h',
-        '../child/webkitplatformsupport_impl.cc',
-        '../child/webkitplatformsupport_impl.h',
-        '../child/websocketstreamhandle_delegate.h',
-        '../child/websocketstreamhandle_impl.cc',
-        '../child/websocketstreamhandle_impl.h',
         '../child/webthemeengine_impl_android.cc',
         '../child/webthemeengine_impl_android.h',
         '../child/webthemeengine_impl_default.cc',
         '../child/webthemeengine_impl_default.h',
         '../child/webthemeengine_impl_mac.cc',
         '../child/webthemeengine_impl_mac.h',
         '../child/webthemeengine_impl_win.cc',
         '../child/webthemeengine_impl_win.h',
         '../child/webthread_impl.cc',
         '../child/webthread_impl.h',
-        '../child/weburlloader_impl.cc',
-        '../child/weburlloader_impl.h',
-        '../child/weburlrequest_extradata_impl.cc',
-        '../child/weburlrequest_extradata_impl.h',
-        '../child/weburlresponse_extradata_impl.cc',
-        '../child/weburlresponse_extradata_impl.h',
         '../child/worker_task_runner.cc',
         '../child/worker_task_runner.h',
       ],
 
       'conditions': [
         ['use_default_render_theme==0', {
           'sources/': [
             ['exclude', 'webthemeengine_impl_default.cc'],
             ['exclude', 'webthemeengine_impl_default.h'],
           ],
@@ skipping 51 matching lines @@
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
         'plugins',
         'webkit_media',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
         '<(SHARED_INTERMEDIATE_DIR)/ui',
       ],
       'sources': [
+        'ftp_directory_listing_response_delegate.cc',
+        'ftp_directory_listing_response_delegate.h',
         'network_list_observer.h',
+        'resource_loader_bridge.cc',
+        'resource_loader_bridge.h',
+        'resource_type.cc',
+        'resource_type.h',
         'simple_webmimeregistry_impl.cc',
         'simple_webmimeregistry_impl.h',
         'webfileutilities_impl.cc',
         'webfileutilities_impl.h',
         'webkit_glue.cc',
         'webkit_glue.h',
         'webkit_glue_export.h',
+        'webkitplatformsupport_impl.cc',
+        'webkitplatformsupport_impl.h',
         'websocketstreamhandle_bridge.h',
+        'websocketstreamhandle_delegate.h',
+        'websocketstreamhandle_impl.cc',
+        'websocketstreamhandle_impl.h',
+        'weburlloader_impl.cc',
+        'weburlloader_impl.h',
       ],
       # When glue is a dependency, it needs to be a hard dependency.
       # Dependents may rely on files generated by this target or one of its
       # own hard dependencies.
       'hard_dependency': 1,
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
@@ skipping 55 matching lines @@
           'variables': {
             'jni_gen_package': 'webkit',
             'input_java_class': 'android/widget/OverScroller.class',
           },
           'includes': [ '../../build/jar_file_jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }