Skip to content

Commit c7c6a10

Browse files
magreenblattmagreenblatt
committed
Update to Chromium version 134.0.6998.0 (#1415337)
1 parent c8be96d commit c7c6a10

File tree

88 files changed

+736
-793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+736
-793
lines changed

‎BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,6 @@ make_pack_header("resources") {
12841284
"$root_gen_dir/chrome/grit/browser_resources.h",
12851285
"$root_gen_dir/chrome/grit/common_resources.h",
12861286
"$root_gen_dir/chrome/grit/component_extension_resources.h",
1287-
"$root_gen_dir/chrome/grit/dev_ui_browser_resources.h",
12881287
"$root_gen_dir/chrome/grit/pdf_resources.h",
12891288
"$root_gen_dir/chrome/grit/renderer_resources.h",
12901289
"$root_gen_dir/components/grit/components_resources.h",
@@ -1312,7 +1311,6 @@ make_pack_header("resources") {
13121311
deps = [
13131312
":cef_resources",
13141313
"//base/tracing/protos:chrome_track_event_resources",
1315-
"//chrome/browser:dev_ui_browser_resources",
13161314
"//chrome/browser:resources",
13171315
"//chrome/browser/resources:component_extension_resources",
13181316
"//chrome/browser/resources/pdf:resources",

‎CHROMIUM_BUILD_COMPATIBILITY.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
88

99
{
10-
'chromium_checkout': 'refs/tags/133.0.6943.0'
10+
'chromium_checkout': 'refs/tags/134.0.6998.0'
1111
}

‎include/internal/cef_types.h

+3
Original file line numberDiff line numberDiff line change
@@ -3621,6 +3621,9 @@ typedef enum {
36213621
CEF_CPAIT_OPTIMIZATION_GUIDE,
36223622
#if CEF_API_ADDED(13304)
36233623
CEF_CPAIT_COLLABORATION_MESSAGING,
3624+
#endif
3625+
#if CEF_API_ADDED(CEF_NEXT)
3626+
CEF_CPAIT_CHANGE_PASSWORD,
36243627
#endif
36253628
CEF_CPAIT_NUM_VALUES,
36263629
} cef_chrome_page_action_icon_type_t;

‎include/internal/cef_types_content_settings.h

+11
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
#define CEF_INCLUDE_INTERNAL_CEF_TYPES_CONTENT_SETTINGS_H_
3232
#pragma once
3333

34+
#include "include/cef_api_hash.h"
35+
3436
#ifdef __cplusplus
3537
extern "C" {
3638
#endif
@@ -484,6 +486,15 @@ typedef enum {
484486
/// or legacy behavior.
485487
CEF_CONTENT_SETTING_TYPE_LEGACY_COOKIE_SCOPE,
486488

489+
#if CEF_API_ADDED(CEF_NEXT)
490+
/// Website setting to indicate whether the user has allowlisted suspicious
491+
/// notifications for the origin.
492+
CEF_CONTENT_SETTING_TYPE_ARE_SUSPICIOUS_NOTIFICATIONS_ALLOWLISTED_BY_USER,
493+
494+
/// Content settings for access to the Controlled Frame API.
495+
CEF_CONTENT_SETTING_TYPE_CONTROLLED_FRAME,
496+
#endif
497+
487498
CEF_CONTENT_SETTING_TYPE_NUM_VALUES,
488499
} cef_content_setting_types_t;
489500

‎libcef/browser/chrome/chrome_content_browser_client_cef.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,14 @@ void ChromeContentBrowserClientCef::CreateWindowResult(
375375
CefBrowserInfoManager::GetInstance()->CreateWindowResult(opener, success);
376376
}
377377

378-
void ChromeContentBrowserClientCef::OverrideWebkitPrefs(
378+
void ChromeContentBrowserClientCef::OverrideWebPreferences(
379379
content::WebContents* web_contents,
380+
content::SiteInstance& main_frame_site,
380381
blink::web_pref::WebPreferences* prefs) {
381382
renderer_prefs::SetDefaultPrefs(*prefs);
382383

383-
ChromeContentBrowserClient::OverrideWebkitPrefs(web_contents, prefs);
384+
ChromeContentBrowserClient::OverrideWebPreferences(web_contents,
385+
main_frame_site, prefs);
384386

385387
SkColor base_background_color;
386388
auto browser = CefBrowserHostBase::GetBrowserForContents(web_contents);

‎libcef/browser/chrome/chrome_content_browser_client_cef.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ class ChromeContentBrowserClientCef : public ChromeContentBrowserClient {
6565
bool* no_javascript_access) override;
6666
void CreateWindowResult(content::RenderFrameHost* opener,
6767
bool success) override;
68-
void OverrideWebkitPrefs(content::WebContents* web_contents,
69-
blink::web_pref::WebPreferences* prefs) override;
68+
void OverrideWebPreferences(content::WebContents* web_contents,
69+
content::SiteInstance& main_frame_site,
70+
blink::web_pref::WebPreferences* prefs) override;
7071
void WillCreateURLLoaderFactory(
7172
content::BrowserContext* browser_context,
7273
content::RenderFrameHost* frame,

‎libcef/browser/native/menu_runner_mac.mm

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
// Create a menu controller based on the model.
2222
MenuControllerCocoa* menu_controller =
2323
[[MenuControllerCocoa alloc] initWithModel:model->model()
24-
delegate:nil
25-
useWithPopUpButtonCell:NO];
24+
delegate:nil];
2625

2726
menu_controller_ = menu_controller;
2827

‎libcef/browser/net/throttle_handler.cc

+10-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ namespace throttle {
1818

1919
namespace {
2020

21-
bool NavigationOnUIThread(content::NavigationHandle* navigation_handle) {
21+
void NavigationOnUIThread(
22+
content::NavigationHandle* navigation_handle,
23+
bool should_run_async,
24+
navigation_interception::InterceptNavigationThrottle::ResultCallback
25+
result_callback) {
2226
CEF_REQUIRE_UIT();
27+
CHECK(!should_run_async);
2328

2429
const bool is_main_frame = navigation_handle->IsInMainFrame();
2530
const auto global_id = frame_util::GetGlobalId(navigation_handle);
@@ -45,7 +50,8 @@ bool NavigationOnUIThread(content::NavigationHandle* navigation_handle) {
4550
navigation_handle->GetWebContents()->GetPrimaryMainFrame(),
4651
open_params, browser)) {
4752
// Cancel the navigation.
48-
return true;
53+
std::move(result_callback).Run(true);
54+
return;
4955
}
5056

5157
bool ignore_navigation = false;
@@ -81,7 +87,7 @@ bool NavigationOnUIThread(content::NavigationHandle* navigation_handle) {
8187
}
8288
}
8389

84-
return ignore_navigation;
90+
std::move(result_callback).Run(ignore_navigation);
8591
}
8692

8793
} // namespace
@@ -95,7 +101,7 @@ void CreateThrottlesForNavigation(content::NavigationHandle* navigation_handle,
95101
std::unique_ptr<content::NavigationThrottle> throttle =
96102
std::make_unique<navigation_interception::InterceptNavigationThrottle>(
97103
navigation_handle, base::BindRepeating(&NavigationOnUIThread),
98-
navigation_interception::SynchronyMode::kSync);
104+
navigation_interception::SynchronyMode::kSync, std::nullopt);
99105

100106
// Always execute our throttle first.
101107
throttles.emplace(throttles.begin(), std::move(throttle));

‎libcef/browser/net_service/cookie_helper.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ void SaveCookiesOnUIThread(
202202
}
203203

204204
net::CookieInclusionStatus status;
205-
status.AddExclusionReason(net::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR);
205+
status.AddExclusionReason(
206+
net::CookieInclusionStatus::ExclusionReason::EXCLUDE_UNKNOWN_ERROR);
206207
SetCanonicalCookieCallback(progress, net::CanonicalCookie(),
207208
net::CookieAccessResult(std::move(status)));
208209
}

‎libcef/browser/net_service/cookie_manager_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ bool CefCookieManagerImpl::SetCookieInternal(
307307
if (!canonical_cookie) {
308308
net::CookieInclusionStatus status;
309309
status.AddExclusionReason(
310-
net::CookieInclusionStatus::EXCLUDE_UNKNOWN_ERROR);
310+
net::CookieInclusionStatus::ExclusionReason::EXCLUDE_UNKNOWN_ERROR);
311311
SetCookieCallbackImpl(callback, net::CookieAccessResult(std::move(status)));
312312
return true;
313313
}

‎libcef/browser/net_service/proxy_url_loader_factory.cc

-14
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,6 @@ class InterceptedRequest : public network::mojom::URLLoader,
263263
const std::optional<GURL>& new_url) override;
264264
void SetPriority(net::RequestPriority priority,
265265
int32_t intra_priority_value) override;
266-
void PauseReadingBodyFromNet() override;
267-
void ResumeReadingBodyFromNet() override;
268266

269267
int32_t id() const { return id_; }
270268

@@ -764,18 +762,6 @@ void InterceptedRequest::SetPriority(net::RequestPriority priority,
764762
}
765763
}
766764

767-
void InterceptedRequest::PauseReadingBodyFromNet() {
768-
if (target_loader_) {
769-
target_loader_->PauseReadingBodyFromNet();
770-
}
771-
}
772-
773-
void InterceptedRequest::ResumeReadingBodyFromNet() {
774-
if (target_loader_) {
775-
target_loader_->ResumeReadingBodyFromNet();
776-
}
777-
}
778-
779765
// Helper methods.
780766

781767
void InterceptedRequest::BeforeRequestReceived(const GURL& original_url,

‎libcef/browser/net_service/stream_reader_url_loader.cc

-4
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,6 @@ void StreamReaderURLLoader::FollowRedirect(
584584
void StreamReaderURLLoader::SetPriority(net::RequestPriority priority,
585585
int intra_priority_value) {}
586586

587-
void StreamReaderURLLoader::PauseReadingBodyFromNet() {}
588-
589-
void StreamReaderURLLoader::ResumeReadingBodyFromNet() {}
590-
591587
void StreamReaderURLLoader::OnInputStreamOpened(
592588
std::unique_ptr<StreamReaderURLLoader::Delegate> returned_delegate,
593589
std::unique_ptr<InputStream> input_stream) {

‎libcef/browser/net_service/stream_reader_url_loader.h

-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ class StreamReaderURLLoader : public network::mojom::URLLoader {
137137
const std::optional<GURL>& new_url) override;
138138
void SetPriority(net::RequestPriority priority,
139139
int intra_priority_value) override;
140-
void PauseReadingBodyFromNet() override;
141-
void ResumeReadingBodyFromNet() override;
142140

143141
private:
144142
void ContinueWithRequestHeaders(

‎libcef/browser/osr/render_widget_host_view_osr.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ CefRenderWidgetHostViewOSR::CefRenderWidgetHostViewOSR(
238238

239239
root_layer_ = std::make_unique<ui::Layer>(ui::LAYER_SOLID_COLOR);
240240

241-
bool opaque = SkColorGetA(background_color_) == SK_AlphaOPAQUE;
242-
GetRootLayer()->SetFillsBoundsOpaquely(opaque);
241+
// Opacity of SOLID_COLOR layer is determined by the color's alpha channel.
243242
GetRootLayer()->SetColor(background_color_);
244243

245244
external_begin_frame_enabled_ = use_external_begin_frame;

‎libcef/browser/osr/software_output_device_proxy.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void SoftwareOutputDeviceProxy::Resize(const gfx::Size& viewport_pixel_size,
9292

9393
canvas_ = skia::CreatePlatformCanvasWithPixels(
9494
viewport_pixel_size_.width(), viewport_pixel_size_.height(), false,
95-
static_cast<uint8_t*>(shm_.memory()), skia::CRASH_ON_FAILURE);
95+
static_cast<uint8_t*>(shm_.memory()), 0U, skia::CRASH_ON_FAILURE);
9696
#else
9797
canvas_ = skia::CreatePlatformCanvasWithSharedSection(
9898
viewport_pixel_size_.width(), viewport_pixel_size_.height(), false,

‎libcef/browser/osr/video_consumer_osr.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void CefVideoConsumerOSR::OnFrameCaptured(
175175
auto& gmb_handle = data->get_gpu_memory_buffer_handle();
176176
cef_accelerated_paint_info_t paint_info;
177177
paint_info.extra = extra;
178-
paint_info.shared_texture_handle = gmb_handle.dxgi_handle.Get();
178+
paint_info.shared_texture_handle = gmb_handle.dxgi_handle().buffer_handle();
179179
paint_info.format = pixel_format;
180180
view_->OnAcceleratedPaint(damage_rect, info->coded_size, paint_info);
181181
#elif BUILDFLAG(IS_APPLE)

‎libcef/browser/task_manager_impl.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
#include "cef/libcef/browser/task_manager_impl.h"
66

7+
#include <ranges>
8+
79
#include "base/check.h"
8-
#include "base/ranges/algorithm.h"
910
#include "base/system/sys_info.h"
1011
#include "cef/libcef/browser/browser_host_base.h"
1112
#include "cef/libcef/browser/context.h"
@@ -27,7 +28,6 @@ CefTaskManager::TaskType toCefTaskType(task_manager::Task::Type type) {
2728
case task_manager::Task::CROSTINI:
2829
case task_manager::Task::PLUGIN_VM:
2930
case task_manager::Task::NACL:
30-
case task_manager::Task::LACROS:
3131
return CEF_TASK_TYPE_UNKNOWN;
3232
case task_manager::Task::BROWSER:
3333
return CEF_TASK_TYPE_BROWSER;
@@ -85,7 +85,7 @@ void CefTaskManagerImpl::OnTaskAdded(int64_t id) {
8585
}
8686

8787
void CefTaskManagerImpl::OnTaskToBeRemoved(int64_t id) {
88-
auto index = base::ranges::find(tasks_, id);
88+
auto index = std::ranges::find(tasks_, id);
8989
if (index != tasks_.end()) {
9090
tasks_.erase(index);
9191
}
@@ -166,7 +166,7 @@ int64_t CefTaskManagerImpl::GetTaskIdForBrowserId(int browser_id) {
166166
}
167167

168168
bool CefTaskManagerImpl::IsValidTaskId(int64_t task_id) const {
169-
return base::ranges::find(tasks_, task_id) != tasks_.end();
169+
return std::ranges::find(tasks_, task_id) != tasks_.end();
170170
}
171171

172172
CefRefPtr<CefTaskManager> CefTaskManager::GetTaskManager() {

‎libcef/browser/views/window_view.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "cef/libcef/browser/views/window_view.h"
66

77
#include <memory>
8+
#include <ranges>
89

910
#include "base/memory/raw_ptr.h"
1011

@@ -16,7 +17,6 @@
1617
#endif
1718
#endif
1819

19-
#include "base/ranges/algorithm.h"
2020
#include "cef/libcef/browser/geometry_util.h"
2121
#include "cef/libcef/browser/image_impl.h"
2222
#include "cef/libcef/browser/views/widget.h"
@@ -887,7 +887,7 @@ void CefWindowView::RemoveOverlayView(CefOverlayViewHost* host,
887887
DCHECK_EQ(host_view->parent(), this);
888888
RemoveChildView(host_view);
889889

890-
const auto it = base::ranges::find_if(
890+
const auto it = std::ranges::find_if(
891891
overlay_hosts_,
892892
[host](CefOverlayViewHost* current) { return current == host; });
893893
DCHECK(it != overlay_hosts_.end());

‎libcef/common/net_service/net_service_util.cc

+7-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@ bool GetCookieDomain(const GURL& url,
3737
domain_string = pc.Domain();
3838
}
3939
net::CookieInclusionStatus status;
40-
return net::cookie_util::GetCookieDomainWithString(url, domain_string, status,
41-
result);
40+
const auto& retval =
41+
net::cookie_util::GetCookieDomainWithString(url, domain_string, status);
42+
if (retval.has_value()) {
43+
*result = *retval;
44+
return true;
45+
}
46+
return false;
4247
}
4348

4449
cef_cookie_same_site_t MakeCefCookieSameSite(net::CookieSameSite value) {

‎libcef/renderer/frame_impl.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,7 @@ void CefFrameImpl::OnDraggableRegionsChanged() {
373373
return;
374374
}
375375

376-
blink::WebVector<blink::WebDraggableRegion> webregions =
377-
frame_->GetDocument().DraggableRegions();
376+
auto webregions = frame_->GetDocument().DraggableRegions();
378377
std::vector<cef::mojom::DraggableRegionEntryPtr> regions;
379378
if (!webregions.empty()) {
380379
auto render_frame = content::RenderFrameImpl::FromWebFrame(frame_);

‎libcef/renderer/v8_impl.cc

+6-5
Original file line numberDiff line numberDiff line change
@@ -462,12 +462,12 @@ void GetCefString(v8::Isolate* isolate,
462462

463463
#if defined(CEF_STRING_TYPE_WIDE)
464464
// Allocate enough space for a worst-case conversion.
465-
int len = str->Utf8Length();
465+
size_t len = str->Utf8LengthV2();
466466
if (len == 0) {
467467
return;
468468
}
469469
char* buf = new char[len + 1];
470-
str->WriteUtf8(isolate, buf, len + 1);
470+
str->WriteUtf8V2(isolate, buf, len, v8::String::WriteFlags::kNullTerminate);
471471

472472
// Perform conversion to the wide type.
473473
cef_string_t* retws = out.GetWritableStruct();
@@ -481,15 +481,16 @@ void GetCefString(v8::Isolate* isolate,
481481
return;
482482
}
483483
char16_t* buf = new char16_t[len + 1];
484-
str->Write(isolate, reinterpret_cast<uint16_t*>(buf), 0, len + 1);
484+
str->WriteV2(isolate, 0, len, reinterpret_cast<uint16_t*>(buf),
485+
v8::String::WriteFlags::kNullTerminate);
485486
#else
486487
// Allocate enough space for a worst-case conversion.
487-
int len = str->Utf8Length();
488+
size_t len = str->Utf8LengthV2();
488489
if (len == 0) {
489490
return;
490491
}
491492
char* buf = new char[len + 1];
492-
str->WriteUtf8(isolate, buf, len + 1);
493+
str->WriteUtf8V2(isolate, buf, len, v8::String::WriteFlags::kNullTerminate);
493494
#endif
494495

495496
// Don't perform an extra string copy.

‎patch/patch.cfg

+3-7
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,9 @@ patches = [
519519
#
520520
# Avoid inclusion of undefined PartitionAlloc dependencies in Dawn after
521521
# https://crrev.com/4dacf2b61c359950d2c2f1b5f9b9d079a01290a4
522+
#
523+
# win: Fix extra qualification on member 'basic_common_reference'
524+
# https://chromium-review.googlesource.com/c/chromium/src/+/6265643
522525
'name': 'base_sandbox_2743',
523526
},
524527
{
@@ -761,12 +764,5 @@ patches = [
761764
# Expose Mojo Connector error state to Receiver disconnect handlers.
762765
# https://github.com/chromiumembedded/cef/issues/3664
763766
'name': 'mojo_connect_result_3664'
764-
},
765-
{
766-
# Fix error: static assertion failed due to requirement 'sizeof(cc::Layer)
767-
# == sizeof(cc::SameSizeAsLayer)' when building with
768-
# enable_backup_ref_ptr_instance_tracer=true.
769-
# https://issues.chromium.org/issues/387277990
770-
'name': 'cc_layer_387277990'
771767
}
772768
]

‎patch/patches/base_command_line_1872.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git base/command_line.cc base/command_line.cc
2-
index 1f3627a128300..430b05e63b5c7 100644
2+
index a35ddac7efebb..dbcfea242b463 100644
33
--- base/command_line.cc
44
+++ base/command_line.cc
5-
@@ -396,11 +396,10 @@ void CommandLine::AppendSwitchNative(std::string_view switch_string,
5+
@@ -404,11 +404,10 @@ void CommandLine::AppendSwitchNative(std::string_view switch_string,
66
#if BUILDFLAG(ENABLE_COMMANDLINE_SEQUENCE_CHECKS)
77
sequence_checker_.Check();
88
#endif

0 commit comments

Comments
 (0)