summaryrefslogtreecommitdiff
path: root/chromium/ios/web
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-12-10 16:19:40 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-12-10 16:01:50 +0000
commit51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch)
tree835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/ios/web
parent6036726eb981b6c4b42047513b9d3f4ac865daac (diff)
downloadqtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ios/web')
-rw-r--r--chromium/ios/web/BUILD.gn7
-rw-r--r--chromium/ios/web/js_compile.gni1
-rw-r--r--chromium/ios/web/public/BUILD.gn4
-rw-r--r--chromium/ios/web/public/test/fakes/BUILD.gn3
-rw-r--r--chromium/ios/web/web_state/BUILD.gn4
-rw-r--r--chromium/ios/web/web_state/ui/BUILD.gn2
6 files changed, 14 insertions, 7 deletions
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index fa431352c9c..f8715af71d4 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -405,6 +405,7 @@ source_set("ios_web_web_state_unittests") {
"web_state/session_certificate_policy_cache_impl_unittest.mm",
"web_state/session_certificate_policy_cache_storage_builder_unittest.mm",
"web_state/web_frame_impl_unittest.mm",
+ "web_state/web_frame_util_unittest.mm",
"web_state/web_frames_manager_impl_unittest.mm",
"web_state/web_state_delegate_bridge_unittest.mm",
"web_state/web_state_impl_unittest.mm",
@@ -452,7 +453,7 @@ source_set("ios_web_web_state_js_unittests") {
"web_state/js/crw_js_injection_manager_unittest.mm",
"web_state/js/crw_js_post_request_loader_unittest.mm",
"web_state/js/crw_js_window_id_manager_unittest.mm",
- "web_state/js/frame_messaging_js_unittest.mm",
+ "web_state/js/message_js_unittest.mm",
"web_state/js/page_script_util_unittest.mm",
]
}
@@ -528,6 +529,7 @@ source_set("ios_web_webui_unittests") {
"//ios/web/test:test_constants",
"//ios/web/test:test_support",
"//net:test_support",
+ "//services/network:test_support",
"//services/service_manager/public/cpp",
"//testing/gmock",
"//testing/gtest",
@@ -580,6 +582,8 @@ test("ios_web_inttests") {
"web_state/error_page_inttest.mm",
"web_state/favicon_callbacks_inttest.mm",
"web_state/http_auth_inttest.mm",
+ "web_state/web_frame_impl_inttest.mm",
+ "web_state/web_frame_web_state_observer_inttest.mm",
"web_state/web_frames_manager_inttest.mm",
"web_state/web_state_observer_inttest.mm",
"webui/web_ui_mojo_inttest.mm",
@@ -625,7 +629,6 @@ js_compile_bundle("all_frames_web_bundle") {
"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/frame_messaging.js",
"web_state/js/resources/message.js",
]
}
diff --git a/chromium/ios/web/js_compile.gni b/chromium/ios/web/js_compile.gni
index 9fd25b1ea1e..83bcc0b7dd7 100644
--- a/chromium/ios/web/js_compile.gni
+++ b/chromium/ios/web/js_compile.gni
@@ -122,7 +122,6 @@ 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/frame_messaging.js",
"//ios/web/web_state/js/resources/message.js",
]
if (defined(invoker.js_modules)) {
diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn
index 65cce83225d..22c482a0906 100644
--- a/chromium/ios/web/public/BUILD.gn
+++ b/chromium/ios/web/public/BUILD.gn
@@ -60,12 +60,9 @@ source_set("public") {
"url_schemes.h",
"url_schemes.mm",
"url_util.h",
- "web_capabilities.cc",
- "web_capabilities.h",
"web_client.h",
"web_kit_constants.h",
"web_state/context_menu_params.h",
- "web_state/form_activity_params.h",
"web_state/global_web_state_observer.h",
"web_state/js/crw_js_injection_evaluator.h",
"web_state/js/crw_js_injection_manager.h",
@@ -85,6 +82,7 @@ source_set("public") {
"web_state/url_verification_constants.h",
"web_state/web_frame.h",
"web_state/web_frame_user_data.h",
+ "web_state/web_frame_util.h",
"web_state/web_frames_manager.h",
"web_state/web_state.h",
"web_state/web_state_delegate.h",
diff --git a/chromium/ios/web/public/test/fakes/BUILD.gn b/chromium/ios/web/public/test/fakes/BUILD.gn
index 59ef2115680..baa2b5d39a8 100644
--- a/chromium/ios/web/public/test/fakes/BUILD.gn
+++ b/chromium/ios/web/public/test/fakes/BUILD.gn
@@ -11,6 +11,7 @@ source_set("fakes") {
"//ios/web/public/download",
"//ios/web/test:test_constants",
"//ios/web/web_state:navigation_context",
+ "//ios/web/web_state:web_frame",
"//ios/web/web_state/ui:crw_web_view_navigation_proxy",
"//ios/web/web_state/ui:web_view_js_utils",
"//ios/web/webui:webui",
@@ -36,6 +37,8 @@ source_set("fakes") {
"fake_download_task.mm",
"fake_navigation_context.h",
"fake_navigation_context.mm",
+ "fake_web_frame.cc",
+ "fake_web_frame.h",
"test_browser_state.cc",
"test_browser_state.h",
"test_java_script_dialog_presenter.h",
diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn
index ca6aed159c8..ccf460c7e29 100644
--- a/chromium/ios/web/web_state/BUILD.gn
+++ b/chromium/ios/web/web_state/BUILD.gn
@@ -103,6 +103,7 @@ source_set("error_translation_util") {
deps = [
"//base",
"//ios/net",
+ "//ios/web/public",
"//net",
]
@@ -158,7 +159,6 @@ source_set("context_menu") {
"context_menu_params.mm",
"context_menu_params_utils.h",
"context_menu_params_utils.mm",
- "form_activity_params.cc",
]
configs += [ "//build/config/compiler:enable_arc" ]
@@ -166,6 +166,7 @@ source_set("context_menu") {
source_set("web_frame") {
deps = [
+ ":web_state_impl_header",
"//base",
"//crypto",
"//ios/web/public",
@@ -175,6 +176,7 @@ source_set("web_frame") {
sources = [
"web_frame_impl.h",
"web_frame_impl.mm",
+ "web_frame_util.mm",
"web_frames_manager_impl.h",
"web_frames_manager_impl.mm",
]
diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn
index 142e016a149..1207c4b06af 100644
--- a/chromium/ios/web/web_state/ui/BUILD.gn
+++ b/chromium/ios/web/web_state/ui/BUILD.gn
@@ -65,6 +65,8 @@ source_set("ui") {
source_set("crw_wk_script_message_router") {
deps = [
"//base",
+ "//ios/web/navigation:core",
+ "//net",
]
sources = [