Add some src/webkit build files to the GN build.

BUG=
TBR=michaeln@chromium.org

Review URL: https://codereview.chromium.org/309643002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273897 0039d316-1c4b-4281-b951-d872f2087c98

BUILD.gn

@@ -85,6 +85,8 @@ group("root") {
     "//ui/surface",
     "//url",
     "//v8:mksnapshot",
+    "//webkit/browser:storage",
+    "//webkit/child",
   ]
 
   if (is_linux) {
@@ -110,6 +112,10 @@ group("root") {
       "//third_party/WebKit/Source/wtf",  # TODO(brettw) re-enable for Android.
       "//tools/gn",
 
+      # Not tested on Android yet:
+      "//webkit/browser:storage",
+      "//webkit/child",
+
       # This stuff all depends on ui/surface which requires some .class jni
       # generators (ui/gl/gl.gyp:surface_jni_headers).
       "//ui/gl",

content/browser/BUILD.gn

@@ -34,9 +34,12 @@ source_set("browser") {
   deps = [
     "//base",
     "//crypto",
+    "//google_apis",
     "//net",
+    "//net:http_server",
     "//skia",
     "//sql",
+    "//third_party/leveldatabase",
     "//third_party/re2",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/zlib",
@@ -49,9 +52,14 @@ source_set("browser") {
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/resources",
+    "//ui/surface",
+    "//webkit:resources",
+    "//webkit:strings",
+    "//webkit/browser:storage",
+    "//webkit/common",
+    "//webkit/common:storage",
     # TODO(GYP)
     #"//ui/snapshot",
-    #'../google_apis/google_apis.gyp:google_apis',
     #'browser/service_worker/service_worker_proto.gyp:database_proto',
     #'browser/speech/proto/speech_proto.gyp:speech_proto',
     #'browser/devtools/devtools_resources.gyp:devtools_resources',
@@ -60,14 +68,6 @@ source_set("browser") {
     #'../mojo/mojo.gyp:mojo_cpp_bindings',
     #'../mojo/mojo.gyp:mojo_js_bindings',
     #'../mojo/mojo.gyp:mojo_service_provider_bindings',
-    #'../net/net.gyp:http_server',
-    #'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-    #'../ui/surface/surface.gyp:surface',
-    #'../webkit/common/webkit_common.gyp:webkit_common',
-    #'../webkit/storage_browser.gyp:webkit_storage_browser',
-    #'../webkit/storage_common.gyp:webkit_storage_common',
-    #'../webkit/webkit_resources.gyp:webkit_resources',
-    #'../webkit/webkit_resources.gyp:webkit_strings',
     #'../third_party/angle/src/build_angle.gyp:commit_id',
   ]
 

webkit/BUILD.gn

+# Copyright 2014 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.
+
+import("//tools/grit/grit_rule.gni")
+
+group("resources") {
+  deps = [
+    ":webkit_resources_action",
+    ":blink_common_resources",
+  ]
+}
+
+grit("webkit_resources_action") {
+  visibility = ":resources"
+  source = "glue/resources/webkit_resources.grd"
+}
+
+grit("blink_common_resources") {
+  visibility = ":resources"
+  source = "//third_party/WebKit/public/blink_resources.grd"
+}
+
+# webkit_strings in webkit_resources.gyp
+grit("strings") {
+  source = "glue/webkit_strings.grd"
+}

webkit/browser/BUILD.gn

+# Copyright 2014 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.
+
+config("storage_config") {
+  if (is_android) {
+    defines = [ "APPCACHE_USE_SIMPLE_CACHE" ]
+  }
+}
+
+component("storage") {
+  output_name = "webkit_storage_browser"
+  sources = [
+    "webkit_storage_browser_export.h",
+    "appcache/appcache.cc",
+    "appcache/appcache.h",
+    "appcache/appcache_backend_impl.cc",
+    "appcache/appcache_backend_impl.h",
+    "appcache/appcache_database.cc",
+    "appcache/appcache_database.h",
+    "appcache/appcache_disk_cache.cc",
+    "appcache/appcache_disk_cache.h",
+    "appcache/appcache_entry.h",
+    "appcache/appcache_executable_handler.h",
+    "appcache/appcache_group.cc",
+    "appcache/appcache_group.h",
+    "appcache/appcache_histograms.cc",
+    "appcache/appcache_histograms.h",
+    "appcache/appcache_host.cc",
+    "appcache/appcache_host.h",
+    "appcache/appcache_policy.h",
+    "appcache/appcache_quota_client.cc",
+    "appcache/appcache_quota_client.h",
+    "appcache/appcache_request_handler.cc",
+    "appcache/appcache_request_handler.h",
+    "appcache/appcache_response.cc",
+    "appcache/appcache_response.h",
+    "appcache/appcache_service.cc",
+    "appcache/appcache_service.h",
+    "appcache/appcache_storage.cc",
+    "appcache/appcache_storage.h",
+    "appcache/appcache_storage_impl.cc",
+    "appcache/appcache_storage_impl.h",
+    "appcache/appcache_working_set.cc",
+    "appcache/appcache_working_set.h",
+    "appcache/appcache_update_job.cc",
+    "appcache/appcache_update_job.h",
+    "appcache/appcache_url_request_job.cc",
+    "appcache/appcache_url_request_job.h",
+    "appcache/manifest_parser.cc",
+    "appcache/manifest_parser.h",
+    "blob/blob_data_handle.cc",
+    "blob/blob_data_handle.h",
+    "blob/blob_storage_context.cc",
+    "blob/blob_storage_context.h",
+    "blob/blob_url_request_job.cc",
+    "blob/blob_url_request_job.h",
+    "blob/blob_url_request_job_factory.cc",
+    "blob/blob_url_request_job_factory.h",
+    "blob/file_stream_reader.cc",
+    "blob/file_stream_reader.h",
+    "blob/local_file_stream_reader.cc",
+    "blob/local_file_stream_reader.h",
+    "blob/view_blob_internals_job.cc",
+    "blob/view_blob_internals_job.h",
+    "database/database_quota_client.cc",
+    "database/database_quota_client.h",
+    "database/database_tracker.cc",
+    "database/database_tracker.h",
+    "database/database_util.cc",
+    "database/database_util.h",
+    "database/databases_table.cc",
+    "database/databases_table.h",
+    "database/vfs_backend.cc",
+    "database/vfs_backend.h",
+    "fileapi/async_file_util.h",
+    "fileapi/async_file_util_adapter.cc",
+    "fileapi/async_file_util_adapter.h",
+    "fileapi/copy_or_move_file_validator.h",
+    "fileapi/copy_or_move_operation_delegate.cc",
+    "fileapi/copy_or_move_operation_delegate.h",
+    "fileapi/dragged_file_util.cc",
+    "fileapi/dragged_file_util.h",
+    "fileapi/external_mount_points.cc",
+    "fileapi/external_mount_points.h",
+    "fileapi/file_observers.h",
+    "fileapi/file_permission_policy.h",
+    "fileapi/file_stream_writer.h",
+    "fileapi/file_system_backend.h",
+    "fileapi/file_system_context.cc",
+    "fileapi/file_system_context.h",
+    "fileapi/file_system_dir_url_request_job.cc",
+    "fileapi/file_system_dir_url_request_job.h",
+    "fileapi/file_system_file_stream_reader.cc",
+    "fileapi/file_system_file_stream_reader.h",
+    "fileapi/file_system_file_util.cc",
+    "fileapi/file_system_file_util.h",
+    "fileapi/file_system_operation.h",
+    "fileapi/file_system_operation_context.cc",
+    "fileapi/file_system_operation_context.h",
+    "fileapi/file_system_operation_impl.cc",
+    "fileapi/file_system_operation_impl.h",
+    "fileapi/file_system_operation_runner.cc",
+    "fileapi/file_system_operation_runner.h",
+    "fileapi/file_system_options.cc",
+    "fileapi/file_system_options.h",
+    "fileapi/file_system_quota_client.cc",
+    "fileapi/file_system_quota_client.h",
+    "fileapi/file_system_quota_util.h",
+    "fileapi/file_system_url.cc",
+    "fileapi/file_system_url.h",
+    "fileapi/file_system_url_request_job.cc",
+    "fileapi/file_system_url_request_job.h",
+    "fileapi/file_system_url_request_job_factory.cc",
+    "fileapi/file_system_url_request_job_factory.h",
+    "fileapi/file_system_usage_cache.cc",
+    "fileapi/file_system_usage_cache.h",
+    "fileapi/file_writer_delegate.cc",
+    "fileapi/file_writer_delegate.h",
+    "fileapi/isolated_context.cc",
+    "fileapi/isolated_context.h",
+    "fileapi/isolated_file_system_backend.cc",
+    "fileapi/isolated_file_system_backend.h",
+    "fileapi/local_file_stream_writer.cc",
+    "fileapi/local_file_stream_writer.h",
+    "fileapi/local_file_util.cc",
+    "fileapi/local_file_util.h",
+    "fileapi/mount_points.cc",
+    "fileapi/mount_points.h",
+    "fileapi/native_file_util.cc",
+    "fileapi/native_file_util.h",
+    "fileapi/obfuscated_file_util.cc",
+    "fileapi/obfuscated_file_util.h",
+    "fileapi/open_file_system_mode.h",
+    "fileapi/plugin_private_file_system_backend.cc",
+    "fileapi/plugin_private_file_system_backend.h",
+    "fileapi/quota/open_file_handle.cc",
+    "fileapi/quota/open_file_handle.h",
+    "fileapi/quota/open_file_handle_context.cc",
+    "fileapi/quota/open_file_handle_context.h",
+    "fileapi/quota/quota_backend_impl.cc",
+    "fileapi/quota/quota_backend_impl.h",
+    "fileapi/quota/quota_reservation.cc",
+    "fileapi/quota/quota_reservation.h",
+    "fileapi/quota/quota_reservation_buffer.cc",
+    "fileapi/quota/quota_reservation_buffer.h",
+    "fileapi/quota/quota_reservation_manager.cc",
+    "fileapi/quota/quota_reservation_manager.h",
+    "fileapi/recursive_operation_delegate.cc",
+    "fileapi/recursive_operation_delegate.h",
+    "fileapi/remove_operation_delegate.cc",
+    "fileapi/remove_operation_delegate.h",
+    "fileapi/sandbox_directory_database.cc",
+    "fileapi/sandbox_directory_database.h",
+    "fileapi/sandbox_file_stream_writer.cc",
+    "fileapi/sandbox_file_stream_writer.h",
+    "fileapi/sandbox_file_system_backend.cc",
+    "fileapi/sandbox_file_system_backend.h",
+    "fileapi/sandbox_file_system_backend_delegate.cc",
+    "fileapi/sandbox_file_system_backend_delegate.h",
+    "fileapi/sandbox_isolated_origin_database.cc",
+    "fileapi/sandbox_isolated_origin_database.h",
+    "fileapi/sandbox_origin_database.cc",
+    "fileapi/sandbox_origin_database.h",
+    "fileapi/sandbox_origin_database_interface.cc",
+    "fileapi/sandbox_origin_database_interface.h",
+    "fileapi/sandbox_prioritized_origin_database.cc",
+    "fileapi/sandbox_prioritized_origin_database.h",
+    "fileapi/sandbox_quota_observer.cc",
+    "fileapi/sandbox_quota_observer.h",
+    "fileapi/task_runner_bound_observer_list.h",
+    "fileapi/timed_task_helper.cc",
+    "fileapi/timed_task_helper.h",
+    "fileapi/transient_file_util.cc",
+    "fileapi/transient_file_util.h",
+    "quota/quota_callbacks.h",
+    "quota/quota_client.h",
+    "quota/quota_database.cc",
+    "quota/quota_database.h",
+    "quota/quota_manager.cc",
+    "quota/quota_manager.h",
+    "quota/quota_manager_proxy.cc",
+    "quota/quota_manager_proxy.h",
+    "quota/quota_task.cc",
+    "quota/quota_task.h",
+    "quota/quota_temporary_storage_evictor.cc",
+    "quota/quota_temporary_storage_evictor.h",
+    "quota/special_storage_policy.cc",
+    "quota/special_storage_policy.h",
+    "quota/storage_monitor.cc",
+    "quota/storage_monitor.h",
+    "quota/storage_observer.cc",
+    "quota/storage_observer.h",
+    "quota/usage_tracker.cc",
+    "quota/usage_tracker.h",
+  ]
+
+  defines = [ "WEBKIT_STORAGE_BROWSER_IMPLEMENTATION" ]
+  configs += [ "//build/config/compiler:wexit_time_destructors" ]
+  direct_dependent_configs = [ ":storage_config" ]
+  if (is_win) {
+    cflags = [ "/wd4267" ]  # TODO(jschuh): fix size_t to int truncations.
+  }
+
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//base/third_party/dynamic_annotations",
+    "//net",
+    "//sql",
+    "//third_party/leveldatabase",
+    "//third_party/sqlite",
+    "//url",
+    "//webkit/common",
+    "//webkit/common:storage",
+  ]
+
+  # TODO(GYP) support chrome_multiple_dll
+  #['chrome_multiple_dll!=1', {
+  #  'dependencies': [
+  #    '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
+  #  ],
+  #}],
+}
+
+executable("dump_file_system") {
+  sources = [
+    "fileapi/dump_file_system.cc",
+  ]
+
+  deps = [
+    ":storage",
+    "//base",
+    "//webkit/common:storage",
+  ]
+}

webkit/child/BUILD.gn

+# Copyright 2014 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.
+
+component("child") {
+  output_name = "webkit_child"
+  sources = [
+    "multipart_response_delegate.cc",
+    "multipart_response_delegate.h",
+    "resource_loader_bridge.cc",
+    "resource_loader_bridge.h",
+    "webkit_child_export.h",
+    "weburlresponse_extradata_impl.cc",
+    "weburlresponse_extradata_impl.h",
+  ]
+
+  defines = [ "WEBKIT_CHILD_IMPLEMENTATION" ]
+  include_dirs = [
+    # For JNI generated header.
+    "$root_gen_dir/webkit",
+  ]
+
+  configs += [ "//build/config/compiler:wexit_time_destructors" ]
+  if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags += [ "/wd4267" ]
+  }
+
+  if (is_mac) {
+    libs = [ "QuartzCore.framework" ]
+  }
+  if (is_android) {
+    #deps += [ ":overscroller_jni_headers" ]  TODO(GYP)
+  }
+
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//base/third_party/dynamic_annotations",
+    "//net",
+    "//skia",
+    #"//third_party/WebKit/public:blink",  TODO(GYP)
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/native_theme",
+    "//url",
+    #"//v8",  TODO(GYP)
+    "//webkit/common",
+  ]
+}
+
+#TODO(GYP)
+#'target_name': 'overscroller_jni_headers',
+#'type': 'none',
+#'variables': {
+#  'jni_gen_package': 'webkit',
+#  'input_java_class': 'android/widget/OverScroller.class',
+#},
+#'includes': [ '../../build/jar_file_jni_generator.gypi' ],
+

webkit/common/BUILD.gn

+# Copyright 2014 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.
+
+component("common") {
+  output_name = "webkit_common"
+
+  sources = [
+    "data_element.cc",
+    "data_element.h",
+    "resource_devtools_info.cc",
+    "resource_devtools_info.h",
+    "resource_type.cc",
+    "resource_type.h",
+    "webkit_common_export.h",
+    "webpreferences.cc",
+    "webpreferences.h",
+  ]
+
+  defines = [ "WEBKIT_COMMON_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//base/third_party/dynamic_annotations",
+    "//net",
+    "//skia",
+    "//third_party/icu",
+    "//third_party/WebKit/public:blink_headers",
+    "//ui/base:ui_base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/resources",
+    "//url",
+    "//webkit:resources",
+  ]
+  forward_dependent_configs_from = [
+    "//third_party/WebKit/public:blink_headers",
+  ]
+}
+
+component("storage") {
+  output_name = "webkit_storage_common"
+  sources = [
+    "webkit_storage_common_export.h",
+    "appcache/appcache_interfaces.cc",
+    "appcache/appcache_interfaces.h",
+    "blob/blob_data.cc",
+    "blob/blob_data.h",
+    "blob/scoped_file.cc",
+    "blob/scoped_file.h",
+    "blob/shareable_file_reference.cc",
+    "blob/shareable_file_reference.h",
+    "database/database_connections.cc",
+    "database/database_connections.h",
+    "database/database_identifier.cc",
+    "database/database_identifier.h",
+    "fileapi/directory_entry.cc",
+    "fileapi/directory_entry.h",
+    "fileapi/file_system_info.cc",
+    "fileapi/file_system_info.h",
+    "fileapi/file_system_mount_option.h",
+    "fileapi/file_system_types.h",
+    "fileapi/file_system_util.cc",
+    "fileapi/file_system_util.h",
+    "quota/quota_status_code.cc",
+    "quota/quota_status_code.h",
+    "quota/quota_types.h",
+  ]
+
+  defines = [ "WEBKIT_STORAGE_COMMON_IMPLEMENTATION" ]
+  if (is_win) {
+    cflags = [ "/wd4267" ]  # TODO(jschuh): fix size_t to int truncations.
+  }
+
+  deps = [
+    ":common",
+    "//base",
+    "//base/third_party/dynamic_annotations",
+    "//net",
+    "//url",
+  ]
+}

webkit/storage_browser.gyp

@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //webkit/browser:storage
       'target_name': 'webkit_storage_browser',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ -226,6 +227,7 @@
       ],
     },
     {
+      # GN version: //webkit/browser:dump_file_system
       'target_name': 'dump_file_system',
       'type': 'executable',
       'sources': [

webkit/storage_common.gyp

@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //webkit/common:storage
       'target_name': 'webkit_storage_common',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ -32,7 +33,7 @@
         'common/database/database_connections.cc',
         'common/database/database_connections.h',
         'common/database/database_identifier.cc',
-        'common/database/database_identifier.cc',
+        'common/database/database_identifier.h',
         'common/fileapi/directory_entry.cc',
         'common/fileapi/directory_entry.h',
         'common/fileapi/file_system_info.cc',

webkit/webkit_resources.gyp

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //webkit:resources
       'target_name': 'webkit_resources',
       'type': 'none',
       'variables': {
@@ -32,6 +33,7 @@
       },
     },
     {
+      # GN version: //webkit:strings
       'target_name': 'webkit_strings',
       'type': 'none',
       'variables': {