diff options
Diffstat (limited to 'chromium/ios/web')
28 files changed, 339 insertions, 183 deletions
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn index a18d25abf1b..bf6cd01f8dd 100644 --- a/chromium/ios/web/BUILD.gn +++ b/chromium/ios/web/BUILD.gn @@ -4,7 +4,6 @@ import("//ios/build/config.gni") import("//ios/web/js_compile.gni") -import("//mojo/public/tools/bindings/mojom.gni") import("//testing/test.gni") import("//tools/grit/grit_rule.gni") @@ -18,16 +17,16 @@ group("all_tests") { source_set("web") { public_deps = [ - ":service_names", + "//ios/web/public/service:service_names", # TODO(crbug.com/616244): Remove private files from public dependencies. - ":services", ":threads", "//ios/web/navigation:core", "//ios/web/net", "//ios/web/public", "//ios/web/public/download", "//ios/web/public/init", + "//ios/web/service", "//ios/web/web_state:web_state_impl_header", "//ios/web/web_state/ui", "//ios/web/web_state/ui:wk_web_view_configuration_provider", @@ -40,11 +39,11 @@ source_set("web") { ":js_resources", ":navigation_resources", ":resources", - ":services", ":threads", "//base", "//ios/web/common", "//ios/web/download", + "//ios/web/favicon", "//ios/web/init", "//ios/web/navigation", "//ios/web/net", @@ -52,14 +51,13 @@ source_set("web") { "//ios/web/public/security", "//ios/web/public/session", "//ios/web/security", + "//ios/web/service", "//ios/web/session", + "//ios/web/thread", "//ios/web/web_state", "//ios/web/web_state:web_view_internal_creation_util", "//services/network:network_service", - "//services/network/public/mojom", - "//services/service_manager", "//services/service_manager/public/cpp", - "//services/service_manager/public/mojom", ] sources = [ @@ -68,9 +66,7 @@ source_set("web") { "browser_url_rewriter_impl.mm", "crw_navigation_item_storage.mm", "network_context_owner.cc", - "url_scheme_util.mm", "web_client.mm", - "web_view_creation_util.mm", ] libs = [ "WebKit.framework" ] @@ -94,34 +90,6 @@ source_set("threads") { configs += [ "//build/config/compiler:enable_arc" ] } -source_set("services") { - deps = [ - ":service_names", - "//ios/web/public", - "//services/network:network_service", - "//services/network/public/mojom", - "//services/service_manager", - "//services/service_manager/public/cpp", - "//services/service_manager/public/mojom", - ] - sources = [ - "service_manager_connection_impl.cc", - "service_manager_connection_impl.h", - "service_manager_context.h", - "service_manager_context.mm", - "web_browser_manifest.h", - "web_browser_manifest.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -mojom("service_names") { - sources = [ - "public/service_names.mojom", - ] -} - source_set("core") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ @@ -238,6 +206,7 @@ test("ios_web_unittests") { "//ios/web/browsing_data:browsing_data_unittests", "//ios/web/common:unittests", "//ios/web/download:download_unittests", + "//ios/web/favicon:unittests", "//ios/web/find_in_page:find_in_page_unittests", "//ios/web/js_messaging:unittests", "//ios/web/security:unittests", @@ -268,7 +237,6 @@ source_set("ios_web_general_unittests") { "//ios/web/test:test_constants", "//ios/web/test:test_support", "//net:test_support", - "//services/service_manager/public/cpp", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", @@ -279,9 +247,7 @@ source_set("ios_web_general_unittests") { "browser_state_unittest.cc", "history_state_util_unittest.mm", "network_context_owner_unittest.cc", - "service_manager_connection_impl_unittest.cc", "test/web_test_unittest.mm", - "url_scheme_util_unittest.mm", "web_client_unittest.mm", "web_thread_unittest.cc", ] @@ -314,7 +280,6 @@ source_set("ios_web_navigation_unittests") { "//ios/web/test/fakes", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", "//net:test_support", - "//services/service_manager/public/cpp", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", @@ -443,12 +408,14 @@ source_set("ios_web_web_state_unittests") { "//ios/testing:ocmock_support", "//ios/web", "//ios/web/common", + "//ios/web/common:web_view_creation_util", "//ios/web/find_in_page", "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:wk_navigation_util", "//ios/web/public", "//ios/web/public/deprecated", + "//ios/web/public/js_messaging", "//ios/web/public/security", "//ios/web/public/session", "//ios/web/public/test", @@ -475,7 +442,6 @@ source_set("ios_web_web_state_unittests") { sources = [ "web_state/context_menu_params_utils_unittest.mm", "web_state/page_display_state_unittest.mm", - "web_state/ui/wk_security_origin_util_unittest.mm", "web_state/web_state_delegate_bridge_unittest.mm", "web_state/web_state_impl_unittest.mm", "web_state/web_state_observer_bridge_unittest.mm", @@ -496,7 +462,9 @@ source_set("ios_web_web_state_js_unittests") { "//components/url_formatter", "//ios/net", "//ios/testing:ocmock_support", + "//ios/web/common:web_view_creation_util", "//ios/web/find_in_page", + "//ios/web/js_messaging", "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", @@ -507,8 +475,6 @@ source_set("ios_web_web_state_js_unittests") { "//ios/web/test:test_support", "//ios/web/web_state:context_menu", "//ios/web/web_state/js", - "//ios/web/web_state/js:script_util", - "//ios/web/web_state/ui:crw_wk_script_message_router", "//net:test_support", "//services/service_manager/public/cpp", "//testing/gmock", @@ -521,10 +487,8 @@ source_set("ios_web_web_state_js_unittests") { "web_state/js/common_js_unittest.mm", "web_state/js/context_menu_js_unittest.mm", "web_state/js/crw_js_injection_manager_unittest.mm", - "web_state/js/crw_js_window_id_manager_unittest.mm", "web_state/js/find_in_page_js_unittest.mm", "web_state/js/message_js_unittest.mm", - "web_state/js/page_script_util_unittest.mm", ] } @@ -540,6 +504,7 @@ source_set("ios_web_web_state_ui_unittests") { "//ios/net", "//ios/testing:ocmock_support", "//ios/web/common", + "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:block_universal_links_buildflags", "//ios/web/navigation:core", @@ -555,11 +520,7 @@ source_set("ios_web_web_state_ui_unittests") { "//ios/web/test/fakes:fakes", "//ios/web/web_state:context_menu", "//ios/web/web_state/js", - "//ios/web/web_state/js:script_util", "//ios/web/web_state/ui:crw_context_menu_controller", - "//ios/web/web_state/ui:crw_wk_script_message_router", - "//ios/web/web_state/ui:favicon_util", - "//ios/web/web_state/ui:web_view_js_utils", "//net:test_support", "//services/service_manager/public/cpp", "//testing/gmock", @@ -573,8 +534,6 @@ source_set("ios_web_web_state_ui_unittests") { "web_state/ui/crw_web_view_content_view_unittest.mm", "web_state/ui/crw_web_view_proxy_impl_unittest.mm", "web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm", - "web_state/ui/crw_wk_script_message_router_unittest.mm", - "web_state/ui/favicon_util_unittest.mm", "web_state/ui/html_element_fetch_request_unittest.mm", "web_state/ui/web_view_js_utils_unittest.mm", "web_state/ui/wk_web_view_configuration_provider_unittest.mm", @@ -623,7 +582,9 @@ test("ios_web_inttests") { "//ios/testing:http_server_bundle_data", "//ios/web:resources_grit", "//ios/web/common", + "//ios/web/common:web_view_creation_util", "//ios/web/download:download_inttests", + "//ios/web/favicon:inttests", "//ios/web/js_messaging:inttests", "//ios/web/navigation", "//ios/web/navigation:core", @@ -664,7 +625,6 @@ test("ios_web_inttests") { "url_loader_inttest.mm", "web_state/bad_ssl_response_inttest.mm", "web_state/error_page_inttest.mm", - "web_state/favicon_callbacks_inttest.mm", "web_state/http_auth_inttest.mm", "web_state/keep_render_process_alive_inttest.mm", "web_state/web_state_observer_inttest.mm", @@ -680,7 +640,6 @@ js_compile_bundle("main_frame_web_bundle") { sources = [ "web_state/js/resources/error.js", - "web_state/js/resources/legacy.js", "web_state/js/resources/main_frame_context_menu.js", "web_state/js/resources/main_frame_web_bundle.js", "web_state/js/resources/navigation.js", @@ -693,12 +652,12 @@ js_compile_bundle("all_frames_web_bundle") { closure_entry_point = "__crWeb.allFramesWebBundle" sources = [ + "js_messaging/resources/message.js", "web_state/js/resources/all_frames_context_menu.js", "web_state/js/resources/all_frames_web_bundle.js", "web_state/js/resources/base.js", "web_state/js/resources/common.js", "web_state/js/resources/find_in_page.js", - "web_state/js/resources/message.js", ] } @@ -707,9 +666,19 @@ js_compile_bundle("all_frames_document_end_web_bundle") { closure_entry_point = "__crWeb.allFramesDocumentEndWebBundle" sources = [ + "js_messaging/resources/setup_frame.js", "web_state/js/resources/all_frames_document_end_web_bundle.js", "web_state/js/resources/plugin_placeholder.js", - "web_state/js/resources/setup_frame.js", + ] +} + +js_compile_bundle("main_frame_document_end_web_bundle") { + visibility = [ ":js_resources" ] + closure_entry_point = "__crWeb.mainFrameDocumentEndWebBundle" + + sources = [ + "favicon/resources/favicon.js", + "web_state/js/resources/main_frame_document_end_web_bundle.js", ] } @@ -726,12 +695,13 @@ js_compile_checked("js_resources") { public_deps = [ ":all_frames_document_end_web_bundle", ":all_frames_web_bundle", + ":main_frame_document_end_web_bundle", ":main_frame_web_bundle", ":nav_bundle", ] sources = [ - "web_state/js/resources/window_id.js", + "js_messaging/resources/window_id.js", ] } diff --git a/chromium/ios/web/common/BUILD.gn b/chromium/ios/web/common/BUILD.gn index a1561641ae5..9e56cb402c9 100644 --- a/chromium/ios/web/common/BUILD.gn +++ b/chromium/ios/web/common/BUILD.gn @@ -15,13 +15,15 @@ source_set("common") { "origin_util.mm", "referrer_util.cc", "referrer_util.h", + "url_scheme_util.h", + "url_scheme_util.mm", "url_util.cc", "url_util.h", ] deps = [ "//base", - "//ios/web/public:referrer", + "//ios/web/public/navigation", "//net", "//url", ] @@ -31,13 +33,31 @@ source_set("common") { configs += [ "//build/config/compiler:enable_arc" ] } +source_set("web_view_creation_util") { + sources = [ + "web_view_creation_util.h", + "web_view_creation_util.mm", + ] + + deps = [ + "//base", + "//ios/web/public:user_agent", + "//ios/web/web_state:web_view_internal_creation_util", + "//ios/web/web_state/ui:wk_web_view_configuration_provider", + ] + + libs = [ "UIKit.framework" ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + source_set("unittests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true deps = [ ":common", "//base", - "//ios/web/public:referrer", + "//ios/web/public/navigation", "//net", "//testing/gtest", "//url", @@ -46,6 +66,7 @@ source_set("unittests") { sources = [ "origin_util_unittest.mm", "referrer_util_unittest.cc", + "url_scheme_util_unittest.mm", "url_util_unittest.cc", ] } diff --git a/chromium/ios/web/favicon/BUILD.gn b/chromium/ios/web/favicon/BUILD.gn new file mode 100644 index 00000000000..d8a81cb6839 --- /dev/null +++ b/chromium/ios/web/favicon/BUILD.gn @@ -0,0 +1,50 @@ +# Copyright 2019 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("//ios/build/config.gni") + +source_set("favicon") { + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "//ios/web/public", + "//ios/web/web_state:web_state_impl_header", + ] + sources = [ + "favicon_manager.h", + "favicon_manager.mm", + "favicon_status.cc", + "favicon_url.cc", + "favicon_util.h", + "favicon_util.mm", + ] +} + +source_set("unittests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + deps = [ + "//base", + "//ios/web/favicon", + "//ios/web/public/favicon", + "//testing/gtest", + ] + sources = [ + "favicon_util_unittest.mm", + ] +} + +source_set("inttests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + deps = [ + "//base", + "//base/test:test_support", + "//ios/web/public", + "//ios/web/public:web_state_types", + "//ios/web/public/test", + ] + sources = [ + "favicon_callbacks_inttest.mm", + ] +} diff --git a/chromium/ios/web/init/BUILD.gn b/chromium/ios/web/init/BUILD.gn index ec5bee26442..93c2255539c 100644 --- a/chromium/ios/web/init/BUILD.gn +++ b/chromium/ios/web/init/BUILD.gn @@ -17,11 +17,11 @@ source_set("init") { "//base", "//base:i18n", "//crypto", - "//ios/web:services", "//ios/web:threads", "//ios/web/net", "//ios/web/public", "//ios/web/public/init", + "//ios/web/service", "//ios/web/webui", "//mojo/core/embedder", "//net", diff --git a/chromium/ios/web/js_compile.gni b/chromium/ios/web/js_compile.gni index 83bcc0b7dd7..c7051bb926d 100644 --- a/chromium/ios/web/js_compile.gni +++ b/chromium/ios/web/js_compile.gni @@ -122,7 +122,7 @@ template("js_compile_checked") { _js_modules = [ "//ios/web/web_state/js/resources/base.js", "//ios/web/web_state/js/resources/common.js", - "//ios/web/web_state/js/resources/message.js", + "//ios/web/js_messaging/resources/message.js", ] if (defined(invoker.js_modules)) { _js_modules += invoker.js_modules diff --git a/chromium/ios/web/js_messaging/BUILD.gn b/chromium/ios/web/js_messaging/BUILD.gn index e65f92fc7ef..7038bba5d9d 100644 --- a/chromium/ios/web/js_messaging/BUILD.gn +++ b/chromium/ios/web/js_messaging/BUILD.gn @@ -9,18 +9,30 @@ source_set("js_messaging") { deps = [ "//base", "//crypto", + "//ios/web/navigation:wk_navigation_util", "//ios/web/public", + "//ios/web/public/deprecated", "//ios/web/public/js_messaging", - "//ios/web/web_state:web_state_impl_header", + "//ios/web/web_view:util", "//url", ] sources = [ + "crw_js_injector.h", + "crw_js_injector.mm", + "crw_js_window_id_manager.h", + "crw_js_window_id_manager.mm", + "crw_wk_script_message_router.h", + "crw_wk_script_message_router.mm", + "page_script_util.h", + "page_script_util.mm", "web_frame_impl.h", "web_frame_impl.mm", "web_frame_util.mm", "web_frames_manager_impl.h", "web_frames_manager_impl.mm", + "web_view_js_utils.h", + "web_view_js_utils.mm", ] } @@ -32,13 +44,18 @@ source_set("unittests") { "//base", "//base/test:test_support", "//crypto", + "//ios/web/common:web_view_creation_util", "//ios/web/public/js_messaging", "//ios/web/public/test", "//ios/web/public/test/fakes", "//testing/gtest", + "//third_party/ocmock", ] sources = [ + "crw_js_window_id_manager_unittest.mm", + "crw_wk_script_message_router_unittest.mm", + "page_script_util_unittest.mm", "web_frame_impl_unittest.mm", "web_frame_util_unittest.mm", "web_frames_manager_impl_unittest.mm", diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn index 559fd7e4c9f..ecdcc11ba3d 100644 --- a/chromium/ios/web/navigation/BUILD.gn +++ b/chromium/ios/web/navigation/BUILD.gn @@ -20,10 +20,12 @@ source_set("navigation") { "//ios/net", "//ios/web:core", "//ios/web/common", + "//ios/web/js_messaging", "//ios/web/navigation:wk_navigation_util", "//ios/web/public", - "//ios/web/public/deprecated", + "//ios/web/public/deprecated:deprecated_navigation_util", "//ios/web/public/download", + "//ios/web/public/js_messaging", "//ios/web/public/security", "//ios/web/public/session", "//ios/web/security", @@ -31,12 +33,15 @@ source_set("navigation") { "//ios/web/web_state:user_interaction", "//ios/web/web_state:web_state_impl_header", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", + "//ios/web/web_state/ui/controller", "//ios/web/web_view:util", "//ui/base", "//url", ] sources = [ + "crw_js_navigation_handler.h", + "crw_js_navigation_handler.mm", "crw_navigation_item_holder.h", "crw_navigation_item_holder.mm", "crw_pending_navigation_info.h", @@ -44,6 +49,9 @@ source_set("navigation") { "crw_session_controller+private_constructors.h", "crw_session_controller.h", "crw_session_controller.mm", + "crw_web_view_navigation_observer.h", + "crw_web_view_navigation_observer.mm", + "crw_web_view_navigation_observer_delegate.h", "crw_wk_navigation_handler.h", "crw_wk_navigation_handler.mm", "crw_wk_navigation_states.h", @@ -83,7 +91,7 @@ source_set("core") { "//components/url_formatter:url_formatter", "//ios/web/navigation:wk_navigation_util", "//ios/web/public", - "//ios/web/public/deprecated", + "//ios/web/public/deprecated:deprecated_navigation_util", "//ios/web/public/security", "//ui/base", ] diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn index e6586a6d6b2..6cd253eb424 100644 --- a/chromium/ios/web/public/BUILD.gn +++ b/chromium/ios/web/public/BUILD.gn @@ -6,9 +6,13 @@ import("//ios/build/config.gni") source_set("public") { public_deps = [ - ":referrer", + ":ui", ":user_agent", ":web_state_types", + "//ios/web/public/favicon", + "//ios/web/public/navigation", + "//ios/web/public/service", + "//ios/web/public/thread", "//net", "//services/network/public/cpp", "//services/network/public/mojom", @@ -23,41 +27,19 @@ source_set("public") { sources = [ "browser_state.h", - "browser_url_rewriter.h", - "favicon_status.cc", - "favicon_status.h", - "favicon_url.cc", - "favicon_url.h", "java_script_dialog_callback.h", "java_script_dialog_presenter.h", "java_script_dialog_type.h", - "navigation_item.h", - "navigation_manager.h", - "reload_type.h", - "service_manager_connection.h", - "url_scheme_util.h", - "url_schemes.h", "url_schemes.mm", "web_client.h", - "web_state/navigation_context.h", - "web_state/page_display_state.h", "web_state/page_display_state.mm", "web_state/ui/crw_web_view_proxy.h", "web_state/ui/crw_web_view_scroll_view_proxy.h", "web_state/web_state.h", "web_state/web_state_delegate.h", "web_state/web_state_delegate_bridge.h", - "web_state/web_state_interface_provider.cc", - "web_state/web_state_interface_provider.h", "web_state/web_state_observer_bridge.h", - "web_state/web_state_policy_decider.h", - "web_state/web_state_policy_decider_bridge.h", "web_state/web_state_user_data.h", - "web_task_traits.cc", - "web_task_traits.h", - "web_thread.h", - "web_thread_delegate.h", - "web_view_creation_util.h", ] libs = [ "WebKit.framework" ] @@ -69,8 +51,8 @@ source_set("public") { # deprecated. source_set("web_state_types") { deps = [ - ":referrer", "//base", + "//ios/web/public/navigation", "//url", ] sources = [ @@ -95,14 +77,9 @@ source_set("user_agent") { configs += [ "//build/config/compiler:enable_arc" ] } -source_set("referrer") { - deps = [ - "//base", - "//url", - ] - +source_set("ui") { sources = [ - "referrer.h", + "web_state/page_display_state.h", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/web/public/deprecated/BUILD.gn b/chromium/ios/web/public/deprecated/BUILD.gn index 02df02d3ae8..92c1e3626ab 100644 --- a/chromium/ios/web/public/deprecated/BUILD.gn +++ b/chromium/ios/web/public/deprecated/BUILD.gn @@ -21,9 +21,33 @@ source_set("deprecated") { "crw_native_content_holder.h", "crw_native_content_provider.h", "global_web_state_observer.h", + "url_verification_constants.h", + ] +} + +# A separate target is needed for util to prevent cyclic dependency, as +# "web_state:web_state_impl_header" depends on ":deprecated" target. +source_set("deprecated_web_util") { + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":deprecated", + "//ios/web/public", + "//ios/web/web_state:web_state_impl_header", + "//ios/web/web_state/ui", + ] + sources = [ + "crw_web_controller_util.h", + "crw_web_controller_util.mm", + ] +} + +source_set("deprecated_navigation_util") { + configs += [ "//build/config/compiler:enable_arc" ] + + sources = [ "navigation_item_list.h", "navigation_item_list.mm", - "url_verification_constants.h", ] } @@ -32,8 +56,8 @@ source_set("test_doubles") { deps = [ ":deprecated", + "//ios/web/js_messaging", "//ios/web/public", - "//ios/web/web_state/ui:web_view_js_utils", "//url", ] diff --git a/chromium/ios/web/public/favicon/BUILD.gn b/chromium/ios/web/public/favicon/BUILD.gn new file mode 100644 index 00000000000..517e9fa575c --- /dev/null +++ b/chromium/ios/web/public/favicon/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2019 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. + +source_set("favicon") { + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "//ui/gfx", + "//ui/gfx/geometry", + "//url", + ] + sources = [ + "favicon_status.h", + "favicon_url.h", + ] +} diff --git a/chromium/ios/web/public/navigation/BUILD.gn b/chromium/ios/web/public/navigation/BUILD.gn new file mode 100644 index 00000000000..573e931a53f --- /dev/null +++ b/chromium/ios/web/public/navigation/BUILD.gn @@ -0,0 +1,27 @@ +# Copyright 2019 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. + +source_set("navigation") { + deps = [ + "//ios/web/public:ui", + "//ios/web/public:user_agent", + "//ios/web/public/deprecated:deprecated_navigation_util", + "//ui/base", + "//url", + ] + + sources = [ + "browser_url_rewriter.h", + "navigation_context.h", + "navigation_item.h", + "navigation_manager.h", + "referrer.h", + "reload_type.h", + "url_schemes.h", + "web_state_policy_decider.h", + "web_state_policy_decider_bridge.h", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/web/public/service/BUILD.gn b/chromium/ios/web/public/service/BUILD.gn new file mode 100644 index 00000000000..d92ed99cc9c --- /dev/null +++ b/chromium/ios/web/public/service/BUILD.gn @@ -0,0 +1,29 @@ +# Copyright 2019 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("//mojo/public/tools/bindings/mojom.gni") + +source_set("service") { + deps = [ + "//base", + "//services/network/public/cpp", + "//services/network/public/mojom", + "//services/service_manager/public/cpp", + "//services/service_manager/public/cpp:cpp_types", + "//services/service_manager/public/mojom", + ] + + sources = [ + "service_manager_connection.h", + "web_state_interface_provider.h", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +mojom("service_names") { + sources = [ + "service_names.mojom", + ] +} diff --git a/chromium/ios/web/public/service_names.mojom b/chromium/ios/web/public/service/service_names.mojom index 25c5a9094f9..25c5a9094f9 100644 --- a/chromium/ios/web/public/service_names.mojom +++ b/chromium/ios/web/public/service/service_names.mojom diff --git a/chromium/ios/web/public/session/BUILD.gn b/chromium/ios/web/public/session/BUILD.gn index 83d5b471784..3b6e0507079 100644 --- a/chromium/ios/web/public/session/BUILD.gn +++ b/chromium/ios/web/public/session/BUILD.gn @@ -7,8 +7,8 @@ source_set("session") { deps = [ "//base", "//ios/web/public", - "//ios/web/public:referrer", "//ios/web/public:user_agent", + "//ios/web/public/navigation", "//net", "//url", ] diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn index 58666c50767..f4e8d7d774e 100644 --- a/chromium/ios/web/public/test/BUILD.gn +++ b/chromium/ios/web/public/test/BUILD.gn @@ -15,6 +15,7 @@ source_set("test") { "//base", "//base/test:test_support", "//ios/web:web", + "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:wk_navigation_util", "//ios/web/public/deprecated", @@ -65,10 +66,10 @@ source_set("util") { ":element_selector", "//base", "//base/test:test_support", + "//ios/web/js_messaging", "//ios/web/public:public", "//ios/web/public/deprecated", "//ios/web/web_state:web_state_impl_header", - "//ios/web/web_state/js:script_util", "//ios/web/web_state/ui:ui", "//ios/web/web_view:util", "//testing/gtest", diff --git a/chromium/ios/web/public/test/fakes/BUILD.gn b/chromium/ios/web/public/test/fakes/BUILD.gn index 9b17bb5dde9..431cc072d16 100644 --- a/chromium/ios/web/public/test/fakes/BUILD.gn +++ b/chromium/ios/web/public/test/fakes/BUILD.gn @@ -12,6 +12,7 @@ source_set("fakes") { "//ios/web/js_messaging", "//ios/web/navigation:core", "//ios/web/public/deprecated", + "//ios/web/public/deprecated:deprecated_navigation_util", "//ios/web/public/download", "//ios/web/public/find_in_page", "//ios/web/public/js_messaging", @@ -19,7 +20,6 @@ source_set("fakes") { "//ios/web/public/session", "//ios/web/test:test_constants", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", - "//ios/web/web_state/ui:web_view_js_utils", "//ios/web/webui:webui", "//net:test_support", "//testing/gtest", @@ -47,6 +47,8 @@ source_set("fakes") { "fake_navigation_context.mm", "fake_web_frame.cc", "fake_web_frame.h", + "fake_web_frames_manager.h", + "fake_web_frames_manager.mm", "fake_web_state_policy_decider.h", "fake_web_state_policy_decider.mm", "test_browser_state.cc", diff --git a/chromium/ios/web/public/thread/BUILD.gn b/chromium/ios/web/public/thread/BUILD.gn new file mode 100644 index 00000000000..2e4525a7096 --- /dev/null +++ b/chromium/ios/web/public/thread/BUILD.gn @@ -0,0 +1,15 @@ +# Copyright 2019 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. + +source_set("thread") { + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "//base", + ] + sources = [ + "web_task_traits.h", + "web_thread.h", + "web_thread_delegate.h", + ] +} diff --git a/chromium/ios/web/security/BUILD.gn b/chromium/ios/web/security/BUILD.gn index 6505171583e..7ef814c1be7 100644 --- a/chromium/ios/web/security/BUILD.gn +++ b/chromium/ios/web/security/BUILD.gn @@ -10,12 +10,13 @@ source_set("security") { deps = [ "//base", "//ios/web/common", + "//ios/web/common:web_view_creation_util", + "//ios/web/js_messaging", "//ios/web/navigation:core", "//ios/web/navigation:navigation_manager_util", "//ios/web/public", "//ios/web/public/security", "//ios/web/web_state:web_state_impl_header", - "//ios/web/web_state/ui:web_view_js_utils", "//net", "//ui/gfx/geometry", ] diff --git a/chromium/ios/web/service/BUILD.gn b/chromium/ios/web/service/BUILD.gn new file mode 100644 index 00000000000..05b529b97a9 --- /dev/null +++ b/chromium/ios/web/service/BUILD.gn @@ -0,0 +1,43 @@ +# Copyright 2019 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. + +source_set("service") { + deps = [ + "//ios/web/public", + "//ios/web/public/service:service_names", + "//services/network:network_service", + "//services/network/public/mojom", + "//services/service_manager", + "//services/service_manager/public/cpp", + "//services/service_manager/public/mojom", + ] + sources = [ + "service_manager_connection_impl.cc", + "service_manager_connection_impl.h", + "service_manager_context.h", + "service_manager_context.mm", + "web_browser_manifest.h", + "web_browser_manifest.mm", + "web_state_interface_provider.cc", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unittests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + deps = [ + ":service", + "//base", + "//base/test:test_support", + "//ios/web/public/test", + "//services/service_manager/public/cpp", + "//testing/gtest", + ] + + sources = [ + "service_manager_connection_impl_unittest.cc", + ] +} diff --git a/chromium/ios/web/shell/BUILD.gn b/chromium/ios/web/shell/BUILD.gn index ec7fd87acce..354d36fef67 100644 --- a/chromium/ios/web/shell/BUILD.gn +++ b/chromium/ios/web/shell/BUILD.gn @@ -71,9 +71,6 @@ source_set("shell") { "//net", "//net:extras", "//services/service_manager/public/cpp", - "//services/test/echo:lib", - "//services/test/echo/public/cpp:manifest", - "//services/test/echo/public/mojom", "//services/test/user_id:lib", "//services/test/user_id/public/cpp:manifest", "//services/test/user_id/public/mojom", diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn index 64f2a7082cc..18567be2035 100644 --- a/chromium/ios/web/shell/test/BUILD.gn +++ b/chromium/ios/web/shell/test/BUILD.gn @@ -173,6 +173,7 @@ source_set("eg_test_support+eg2") { deps = [ "//base", "//base/test:test_support", + "//ios/testing:http_server_bundle_data", "//ios/testing:nserror_support", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", @@ -231,6 +232,4 @@ ios_eg2_test("ios_web_shell_eg2tests_module") { # Test support libraries. ":eg_tests+eg2", ] - - bundle_deps = [ "//ios/testing:http_server_bundle_data" ] } diff --git a/chromium/ios/web/test/BUILD.gn b/chromium/ios/web/test/BUILD.gn index e4270f5f033..e773ae94f13 100644 --- a/chromium/ios/web/test/BUILD.gn +++ b/chromium/ios/web/test/BUILD.gn @@ -59,6 +59,7 @@ source_set("test_support") { "//base", "//base/test:test_support", "//ios/web", + "//ios/web/common:web_view_creation_util", "//ios/web/navigation:core", "//ios/web/public/test:util", "//ios/web/public/test/fakes", diff --git a/chromium/ios/web/thread/BUILD.gn b/chromium/ios/web/thread/BUILD.gn new file mode 100644 index 00000000000..cafa52d626c --- /dev/null +++ b/chromium/ios/web/thread/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2019 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("//ios/build/config.gni") + +source_set("thread") { + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "//ios/web/public", + ] + + sources = [ + "web_task_traits.cc", + ] +} diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn index f44709057e3..8d0dfa9b57a 100644 --- a/chromium/ios/web/web_state/BUILD.gn +++ b/chromium/ios/web/web_state/BUILD.gn @@ -10,6 +10,7 @@ source_set("web_state") { ":web_state_impl_header", "//base", "//ios/web/common", + "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:core", "//ios/web/navigation:wk_navigation_util", @@ -22,6 +23,7 @@ source_set("web_state") { "//ios/web/session", "//ios/web/web_state/ui", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", + "//ios/web/web_view:util", "//ios/web/webui", "//net", "//ui/gfx", @@ -49,6 +51,7 @@ source_set("web_state") { source_set("web_state_impl_header") { deps = [ "//base", + "//ios/web/js_messaging", "//ios/web/navigation:core", "//ios/web/public", "//ios/web/public/js_messaging", diff --git a/chromium/ios/web/web_state/js/BUILD.gn b/chromium/ios/web/web_state/js/BUILD.gn index 0d9490c146d..34b00578bcc 100644 --- a/chromium/ios/web/web_state/js/BUILD.gn +++ b/chromium/ios/web/web_state/js/BUILD.gn @@ -6,8 +6,8 @@ import("//ios/build/config.gni") source_set("js") { deps = [ - ":script_util", "//base", + "//ios/web/js_messaging", "//ios/web/public", "//ios/web/public/deprecated", ] @@ -15,22 +15,6 @@ source_set("js") { sources = [ "crw_js_injection_manager.mm", "crw_js_injection_receiver.mm", - "crw_js_window_id_manager.h", - "crw_js_window_id_manager.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("script_util") { - deps = [ - "//base", - "//ios/web/public", - ] - - sources = [ - "page_script_util.h", - "page_script_util.mm", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn index bb46f6b59a6..0b66a6af303 100644 --- a/chromium/ios/web/web_state/ui/BUILD.gn +++ b/chromium/ios/web/web_state/ui/BUILD.gn @@ -8,14 +8,12 @@ source_set("ui") { deps = [ ":crw_context_menu_controller", ":crw_web_view_navigation_proxy", - ":crw_wk_script_message_router", - ":favicon_util", - ":web_view_js_utils", "//base", "//ios/net", "//ios/web:core", "//ios/web/browsing_data", "//ios/web/common", + "//ios/web/favicon", "//ios/web/find_in_page", "//ios/web/js_messaging", "//ios/web/navigation", @@ -48,8 +46,6 @@ source_set("ui") { ] sources = [ - "crw_js_injector.h", - "crw_js_injector.mm", "crw_swipe_recognizer_provider.h", "crw_touch_tracking_recognizer.h", "crw_touch_tracking_recognizer.mm", @@ -57,32 +53,16 @@ source_set("ui") { "crw_web_controller.mm", "crw_web_controller_container_view.h", "crw_web_controller_container_view.mm", + "crw_web_request_controller.h", + "crw_web_request_controller.mm", "crw_web_view_proxy_impl.h", "crw_web_view_proxy_impl.mm", "crw_web_view_scroll_view_proxy.mm", "crw_wk_ui_handler.h", "crw_wk_ui_handler.mm", "crw_wk_ui_handler_delegate.h", - "wk_security_origin_util.h", - "wk_security_origin_util.mm", - ] - - libs = [ "WebKit.framework" ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("crw_wk_script_message_router") { - deps = [ - "//base", - "//ios/web/navigation:core", - "//ios/web/navigation:wk_navigation_util", - "//net", - ] - - sources = [ - "crw_wk_script_message_router.h", - "crw_wk_script_message_router.mm", + "js_window_error_manager.h", + "js_window_error_manager.mm", ] libs = [ "WebKit.framework" ] @@ -103,11 +83,12 @@ source_set("crw_web_view_navigation_proxy") { source_set("crw_context_menu_controller") { deps = [ "//base", + "//ios/web/js_messaging", "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/web_state:context_menu", - "//ios/web/web_state/ui:crw_wk_script_message_router", "//ios/web/web_state/ui:wk_web_view_configuration_provider", + "//ui/base", ] sources = [ @@ -122,12 +103,11 @@ source_set("crw_context_menu_controller") { source_set("wk_web_view_configuration_provider") { deps = [ - ":crw_wk_script_message_router", "//base", "//ios/web/common", + "//ios/web/js_messaging", "//ios/web/public", "//ios/web/web_state/js", - "//ios/web/web_state/js:script_util", "//ios/web/webui", ] @@ -141,35 +121,3 @@ source_set("wk_web_view_configuration_provider") { configs += [ "//build/config/compiler:enable_arc" ] } - -source_set("web_view_js_utils") { - deps = [ - "//base", - "//ios/web/public", - ] - - sources = [ - "web_view_js_utils.h", - "web_view_js_utils.mm", - ] - - libs = [ "WebKit.framework" ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("favicon_util") { - deps = [ - "//base", - "//ios/web/public", - ] - - sources = [ - "favicon_util.h", - "favicon_util.mm", - ] - - libs = [ "WebKit.framework" ] - - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/ios/web/web_view/BUILD.gn b/chromium/ios/web/web_view/BUILD.gn index e59f0a7c2ab..aca0f14a15f 100644 --- a/chromium/ios/web/web_view/BUILD.gn +++ b/chromium/ios/web/web_view/BUILD.gn @@ -6,8 +6,12 @@ import("//ios/build/config.gni") source_set("util") { sources = [ + "content_type_util.cc", + "content_type_util.h", "error_translation_util.h", "error_translation_util.mm", + "wk_security_origin_util.h", + "wk_security_origin_util.mm", "wk_web_view_util.h", "wk_web_view_util.mm", ] @@ -38,7 +42,9 @@ source_set("unittests") { ] sources = [ + "content_type_util_unittest.cc", "error_translation_util_unittest.mm", + "wk_security_origin_util_unittest.mm", "wk_web_view_util_unittest.mm", ] } diff --git a/chromium/ios/web/webui/BUILD.gn b/chromium/ios/web/webui/BUILD.gn index b86c57f954c..3ae7ea07ebc 100644 --- a/chromium/ios/web/webui/BUILD.gn +++ b/chromium/ios/web/webui/BUILD.gn @@ -10,6 +10,7 @@ source_set("webui") { "//ios/web:resources", "//ios/web:resources_grit", "//ios/web/public", + "//ios/web/public/js_messaging", "//ios/web/public/webui", "//ios/web/web_state:web_state_impl_header", "//mojo/public/cpp/system", |