summaryrefslogtreecommitdiff
path: root/chromium/ios/web
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-10-13 13:24:50 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-10-14 10:57:25 +0000
commitaf3d4809763ef308f08ced947a73b624729ac7ea (patch)
tree4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/ios/web
parent0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff)
downloadqtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking. Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/ios/web')
-rw-r--r--chromium/ios/web/ios_web.gyp22
-rw-r--r--chromium/ios/web/ios_web_unittests.gyp5
-rw-r--r--chromium/ios/web/js_compile_checked.gypi1
3 files changed, 26 insertions, 2 deletions
diff --git a/chromium/ios/web/ios_web.gyp b/chromium/ios/web/ios_web.gyp
index ec02fc17396..a1ab0fff1db 100644
--- a/chromium/ios/web/ios_web.gyp
+++ b/chromium/ios/web/ios_web.gyp
@@ -51,6 +51,7 @@
'js_resources',
'user_agent',
'../../base/base.gyp:base',
+ '../../components/url_formatter/url_formatter.gyp:url_formatter',
'../../content/content.gyp:content_browser',
'../../ios/net/ios_net.gyp:ios_net',
'../../ios/third_party/blink/blink_html_tokenizer.gyp:blink_html_tokenizer',
@@ -127,6 +128,10 @@
'net/clients/crw_redirect_network_client_factory.mm',
'net/cookie_notification_bridge.h',
'net/cookie_notification_bridge.mm',
+ 'net/crw_cert_policy_cache.h',
+ 'net/crw_cert_policy_cache.mm',
+ 'net/crw_cert_verification_controller.h',
+ 'net/crw_cert_verification_controller.mm',
'net/crw_request_tracker_delegate.h',
'net/crw_url_verifying_protocol_handler.h',
'net/crw_url_verifying_protocol_handler.mm',
@@ -144,6 +149,8 @@
'public/browser_state.h',
'public/browser_url_rewriter.h',
'public/browsing_data_partition.h',
+ 'public/browsing_data_partition_client.cc',
+ 'public/browsing_data_partition_client.h',
'public/cert_policy.h',
'public/cert_store.h',
'public/certificate_policy_cache.h',
@@ -175,12 +182,13 @@
'public/web_client.mm',
'public/web_controller_factory.h',
'public/web_controller_factory.mm',
+ 'public/web_kit_constants.h',
'public/web_state/credential.h',
'public/web_state/crw_web_controller_observer.h',
- 'public/web_state/crw_web_delegate.h',
'public/web_state/crw_web_user_interface_delegate.h',
'public/web_state/crw_web_view_proxy.h',
'public/web_state/crw_web_view_scroll_view_proxy.h',
+ 'public/web_state/global_web_state_observer.h',
'public/web_state/js/crw_js_injection_evaluator.h',
'public/web_state/js/crw_js_injection_manager.h',
'public/web_state/js/crw_js_injection_receiver.h',
@@ -190,15 +198,18 @@
'public/web_state/ui/crw_generic_content_view.h',
'public/web_state/ui/crw_native_content.h',
'public/web_state/ui/crw_native_content_provider.h',
+ 'public/web_state/ui/crw_web_delegate.h',
'public/web_state/ui/crw_web_view_content_view.h',
'public/web_state/url_verification_constants.h',
'public/web_state/web_state.h',
'public/web_state/web_state_observer.h',
'public/web_state/web_state_observer_bridge.h',
+ 'public/web_state/web_state_policy_decider.h',
'public/web_state/web_state_user_data.h',
'public/web_thread.h',
'public/web_thread_delegate.h',
'public/web_ui_ios_data_source.h',
+ 'public/web_view_counter.h',
'public/web_view_creation_util.h',
'public/web_view_type.h',
'string_util.cc',
@@ -209,6 +220,7 @@
'user_metrics.cc',
'weak_nsobject_counter.h',
'weak_nsobject_counter.mm',
+ 'web_kit_constants.cc',
'web_state/blocked_popup_info.h',
'web_state/blocked_popup_info.mm',
'web_state/credential.cc',
@@ -219,6 +231,9 @@
'web_state/error_translation_util.h',
'web_state/error_translation_util.mm',
'web_state/frame_info.h',
+ 'web_state/global_web_state_event_tracker.cc',
+ 'web_state/global_web_state_event_tracker.h',
+ 'web_state/global_web_state_observer.cc',
'web_state/js/credential_util.h',
'web_state/js/credential_util.mm',
'web_state/js/crw_js_early_script_manager.h',
@@ -262,6 +277,8 @@
'web_state/ui/crw_wk_web_view_web_controller.mm',
'web_state/ui/web_view_js_utils.h',
'web_state/ui/web_view_js_utils.mm',
+ 'web_state/ui/wk_back_forward_list_item_holder.h',
+ 'web_state/ui/wk_back_forward_list_item_holder.mm',
'web_state/ui/wk_web_view_configuration_provider.h',
'web_state/ui/wk_web_view_configuration_provider.mm',
'web_state/web_controller_observer_bridge.h',
@@ -272,10 +289,13 @@
'web_state/web_state_impl.mm',
'web_state/web_state_observer.cc',
'web_state/web_state_observer_bridge.mm',
+ 'web_state/web_state_policy_decider.mm',
'web_state/web_view_internal_creation_util.h',
'web_state/web_view_internal_creation_util.mm',
'web_state/wk_web_view_security_util.h',
'web_state/wk_web_view_security_util.mm',
+ 'web_view_counter_impl.h',
+ 'web_view_counter_impl.mm',
'web_view_creation_util.mm',
'webui/crw_web_ui_manager.h',
'webui/crw_web_ui_manager.mm',
diff --git a/chromium/ios/web/ios_web_unittests.gyp b/chromium/ios/web/ios_web_unittests.gyp
index a8d6e6b562f..f6df39f9cf1 100644
--- a/chromium/ios/web/ios_web_unittests.gyp
+++ b/chromium/ios/web/ios_web_unittests.gyp
@@ -39,6 +39,8 @@
'net/clients/crw_csp_network_client_unittest.mm',
'net/clients/crw_js_injection_network_client_unittest.mm',
'net/clients/crw_passkit_network_client_unittest.mm',
+ 'net/crw_cert_policy_cache_unittest.mm',
+ 'net/crw_cert_verification_controller_unittest.mm',
'net/crw_url_verifying_protocol_handler_unittest.mm',
'net/request_group_util_unittest.mm',
'net/request_tracker_impl_unittest.mm',
@@ -69,10 +71,12 @@
'web_state/ui/crw_wk_simple_web_view_controller_unittest.mm',
'web_state/ui/crw_wk_web_view_crash_detector_unittest.mm',
'web_state/ui/web_view_js_utils_unittest.mm',
+ 'web_state/ui/wk_back_forward_list_item_holder_unittest.mm',
'web_state/ui/wk_web_view_configuration_provider_unittest.mm',
'web_state/web_state_impl_unittest.mm',
'web_state/web_view_internal_creation_util_unittest.mm',
'web_state/wk_web_view_security_util_unittest.mm',
+ 'web_view_counter_impl_unittest.mm',
'webui/crw_web_ui_manager_unittest.mm',
'webui/crw_web_ui_page_builder_unittest.mm',
'webui/url_fetcher_block_adapter_unittest.mm',
@@ -82,6 +86,7 @@
'action_name': 'copy_test_data',
'variables': {
'test_data_files': [
+ '../../net/data/ssl/certificates/',
'test/data/chrome.html',
'test/data/testbadpass.pkpass',
'test/data/testfavicon.png',
diff --git a/chromium/ios/web/js_compile_checked.gypi b/chromium/ios/web/js_compile_checked.gypi
index 359bc69c7b2..fe04d94ace8 100644
--- a/chromium/ios/web/js_compile_checked.gypi
+++ b/chromium/ios/web/js_compile_checked.gypi
@@ -34,7 +34,6 @@
'SIMPLE_OPTIMIZATIONS',
'--jscomp_error=accessControls',
'--jscomp_error=ambiguousFunctionDecl',
- '--jscomp_error=checkStructDictInheritance',
# '--jscomp_error=checkTypes',
# '--jscomp_error=checkVars',
'--jscomp_error=constantProperty',