diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 8ea870101..c0a8896c2 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/98.0.4758.55', + 'chromium_checkout': 'refs/tags/98.0.4758.80', 'depot_tools_checkout': 'db41eed6b7' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index f00e6f783..aefd67e38 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 2cf191150882d..81e7d98700fed 100644 // TODO(wjmaclean): We should update the ProcessLock comparison API diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index 733677a6e7b58..8f6a488dc23af 100644 +index 26042a1efae8e..53e564f461a63 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -5922,6 +5922,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( +@@ -5923,6 +5923,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( network::mojom::WebSandboxFlags sandbox_flags) { // Calculate an approximation of the origin. The sandbox/csp are ignored. url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this); @@ -36,7 +36,7 @@ index 733677a6e7b58..8f6a488dc23af 100644 // Apply sandbox flags. // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag -@@ -5955,6 +5961,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { +@@ -5956,6 +5962,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { if (IsSameDocument() || IsPageActivation()) return GetRenderFrameHost()->GetLastCommittedOrigin(); diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index b4c918a60..c6eed97e7 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -12,7 +12,7 @@ index 3c2d16c7135d8..5dc02effff2ca 100644 GetContentClient()->browser()->GetUserAgent()); version.SetString("V8-Version", V8_VERSION_STRING); diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc -index 6ed02d4244d45..68dff171001c7 100644 +index 10ec894cb10a7..4fd00d73fd00c 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc @@ -672,6 +672,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest( diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 1bda8e840..1ce2c03cd 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -196,7 +196,7 @@ index 1fa1e67dddcfd..7af2a0e231824 100644 // once each time the extensions system is loaded per browser_context. The // implementation may wish to use the BrowserContext to record the current diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc -index bee1c92ce2b69..31e6d5587de2a 100644 +index 9c5c1404df84a..e09394bb97547 100644 --- extensions/browser/process_manager.cc +++ extensions/browser/process_manager.cc @@ -391,9 +391,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension, diff --git a/patch/patches/net_cookie_flags.patch b/patch/patches/net_cookie_flags.patch index 38910ee69..5603e15dd 100644 --- a/patch/patches/net_cookie_flags.patch +++ b/patch/patches/net_cookie_flags.patch @@ -10,7 +10,7 @@ index 96d1a51ec1078..e8120a818b1f2 100644 +// This load will not send any cookies. For CEF usage. +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17) diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc -index dc5c2d9ab617b..9d88970660678 100644 +index 76dafbb67d133..54f3948b8c6f8 100644 --- net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc @@ -561,7 +561,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() { diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index 89951bc19..773687c5d 100644 --- a/patch/patches/print_preview_123.patch +++ b/patch/patches/print_preview_123.patch @@ -46,7 +46,7 @@ index 1cf3cbf2a5ed0..09f43d550eebc 100644 #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/task_manager/web_contents_tags.h" diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc -index aad37ff0fdbc4..b5780c7581b36 100644 +index 772a5cfdc75bf..7ae76effc5a34 100644 --- chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc @@ -248,12 +248,13 @@ void UpdatePrintSettingsOnIO( diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 34036bd15..0561b9514 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc -index 598fb5e2ee02a..85e742c8c1fec 100644 +index ed2c1ebad634e..6857da1707816 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -21,6 +21,7 @@ @@ -31,10 +31,10 @@ index 598fb5e2ee02a..85e742c8c1fec 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -708,7 +721,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( - base_cache_path.Append(chrome::kCacheDirname); - network_context_params->http_cache_max_size = - local_state->GetInteger(prefs::kDiskCacheSize); +@@ -723,7 +736,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( + network_context_params->http_cache_max_size = + local_state->GetInteger(prefs::kDiskCacheSize); + } + } + if (!in_memory) { diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 63586d0cc..01559db7d 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -309,7 +309,7 @@ index 9432480a38e45..82c4ffa97eee4 100644 // a reference. raw_ptr tooltip_; diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index bc07e34bde24f..35089937d13aa 100644 +index daf03e0c60854..c3aa171205b30 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc @@ -340,7 +340,8 @@ void Widget::Init(InitParams params) { @@ -363,7 +363,7 @@ index bc07e34bde24f..35089937d13aa 100644 } diff --git ui/views/widget/widget.h ui/views/widget/widget.h -index b88cc69c0489d..c254fc09806a5 100644 +index 65cc274436fc9..9edaee5afe20a 100644 --- ui/views/widget/widget.h +++ ui/views/widget/widget.h @@ -329,6 +329,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 374a7f9d2..0c2daa14a 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 03b7c24726c2a..32de6f45c1973 100644 +index 031ae3493232e..6d08bcb7aa80b 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -2971,6 +2971,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2975,6 +2975,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { params.renderer_initiated_creation, params.main_frame_name, GetOriginalOpener()); @@ -15,7 +15,7 @@ index 03b7c24726c2a..32de6f45c1973 100644 WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -2981,6 +2987,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2985,6 +2991,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { view_.reset(CreateWebContentsView(this, delegate, &render_view_host_delegate_view_)); } @@ -23,7 +23,7 @@ index 03b7c24726c2a..32de6f45c1973 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -3854,6 +3861,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -3858,6 +3865,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( // objects. create_params.renderer_initiated_creation = !is_new_browsing_instance; @@ -39,7 +39,7 @@ index 03b7c24726c2a..32de6f45c1973 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -7631,6 +7647,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -7657,6 +7673,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // frames). SetFocusedFrameTree(node->frame_tree()); } diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 71db54200..5fc2bdf61 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -11,7 +11,7 @@ index 14d4a00293ab0..fc574edaaa2ad 100644 // Cancels and hides the current popup (datetime, select...) if any. virtual void CancelPagePopup() = 0; diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc -index 68dfddc7d98a2..7ae8a410bf4ed 100644 +index 567ea9b7bd78a..07592bcfa83db 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -248,8 +248,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -62,10 +62,10 @@ index 63e97c417f170..2423ae2573624 100644 TransformationMatrix device_emulation_transform_; diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc -index c821dd940201d..5e62b8bda57b6 100644 +index 2e56076fd5aa9..f1bd8f9625f45 100644 --- third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc -@@ -863,7 +863,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { +@@ -900,7 +900,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame, HTMLSelectElement& select) { NotifyPopupOpeningObservers();