bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 117.0.5938.0 (#1181205)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-08-09 17:17:17 -04:00
parent 52cb08b973
commit a4b27a7248
93 changed files with 496 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
patch/patches/chrome_browser_browser.patch
View File

@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index c2b27aea9b244..021203f3a67cc 100644
index cc4fbda7ddfa8..c7278ef3d7ff7 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@ -24,7 +24,7 @@ index c2b27aea9b244..021203f3a67cc 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -376,6 +377,10 @@ static_library("ui") {
@@ -380,6 +381,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@ -35,7 +35,7 @@ index c2b27aea9b244..021203f3a67cc 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -400,6 +405,7 @@ static_library("ui") {
@@ -404,6 +409,7 @@ static_library("ui") {
"//build:chromeos_buildflags",
"//build/config/chromebox_for_meetings:buildflags",
"//cc/paint",
@ -43,7 +43,7 @@ index c2b27aea9b244..021203f3a67cc 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/app:chrome_dll_resources",
@@ -2646,6 +2652,8 @@ static_library("ui") {
@@ -2683,6 +2689,8 @@ static_library("ui") {
"views/apps/app_dialog/app_block_dialog_view.h",
"views/apps/app_dialog/app_pause_dialog_view.cc",
"views/apps/app_dialog/app_pause_dialog_view.h",
@ -52,7 +52,7 @@ index c2b27aea9b244..021203f3a67cc 100644
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
"views/apps/chrome_app_window_client_views_chromeos.cc",
@@ -4524,8 +4532,6 @@ static_library("ui") {
@@ -4573,8 +4581,6 @@ static_library("ui") {
"views/accessibility/theme_tracking_non_accessible_image_view.h",
"views/apps/app_dialog/app_dialog_view.cc",
"views/apps/app_dialog/app_dialog_view.h",
@ -61,7 +61,7 @@ index c2b27aea9b244..021203f3a67cc 100644
"views/apps/app_info_dialog/app_info_dialog_container.cc",
"views/apps/app_info_dialog/app_info_dialog_container.h",
"views/apps/app_info_dialog/app_info_dialog_views.cc",
@@ -6165,6 +6171,7 @@ static_library("ui") {
@@ -6226,6 +6232,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@ -70,10 +70,10 @@ index c2b27aea9b244..021203f3a67cc 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 9125b6d7e3e87..9140a9cf4ca7d 100644
index 501783a57a06e..5a90cf466eed1 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -264,6 +264,25 @@
@@ -263,6 +263,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@ -99,7 +99,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -511,6 +530,13 @@ Browser::Browser(const CreateParams& params)
@@ -505,6 +524,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this);
@ -113,7 +113,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -651,6 +677,12 @@ Browser::~Browser() {
@@ -645,6 +671,12 @@ Browser::~Browser() {
// away so they don't try and call back to us.
if (select_file_dialog_.get())
select_file_dialog_->ListenerDestroyed();
@ -126,7 +126,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1381,6 +1413,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1380,6 +1412,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@ -141,7 +141,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1388,8 +1428,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1387,8 +1427,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -244,7 +244,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -2011,11 +2101,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2017,11 +2107,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -260,7 +260,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2205,6 +2299,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2211,6 +2305,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@ -276,7 +276,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2753,13 +2856,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -2762,13 +2865,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@ -298,7 +298,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
return window_ ? window_->GetStatusBubble() : nullptr;
}
@@ -2893,6 +3003,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2902,6 +3012,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@ -308,7 +308,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index b0fdd85964754..f86896354ec6f 100644
index 9fceed57deff5..bc0058f0b1db2 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@ -319,7 +319,7 @@ index b0fdd85964754..f86896354ec6f 100644
#include "chrome/browser/tab_contents/web_contents_collection.h"
#include "chrome/browser/themes/theme_service_observer.h"
#include "chrome/browser/ui/bookmarks/bookmark_bar.h"
@@ -49,6 +50,10 @@
@@ -48,6 +49,10 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/shell_dialogs/select_file_dialog.h"
@ -330,9 +330,9 @@ index b0fdd85964754..f86896354ec6f 100644
#if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -324,6 +329,11 @@ class Browser : public TabStripModelObserver,
double initial_aspect_ratio = 1.0;
bool lock_aspect_ratio = false;
@@ -322,6 +327,11 @@ class Browser : public TabStripModelObserver,
// Document Picture in Picture options, specific to TYPE_PICTURE_IN_PICTURE.
absl::optional<blink::mojom::PictureInPictureWindowOptions> pip_options;
+#if BUILDFLAG(ENABLE_CEF)
+ // Opaque CEF-specific configuration. Will be propagated to new Browsers.
@ -342,8 +342,8 @@ index b0fdd85964754..f86896354ec6f 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -399,6 +409,13 @@ class Browser : public TabStripModelObserver,
force_skip_warning_user_on_close_ = force_skip_warning_user_on_close;
@@ -403,6 +413,13 @@ class Browser : public TabStripModelObserver,
update_ui_immediately_for_testing_ = true;
}
+ // Return true if CEF will expose the toolbar to the client. This value is
@ -356,7 +356,7 @@ index b0fdd85964754..f86896354ec6f 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -472,6 +489,12 @@ class Browser : public TabStripModelObserver,
@@ -476,6 +493,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
@ -369,7 +369,7 @@ index b0fdd85964754..f86896354ec6f 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -867,11 +890,19 @@ class Browser : public TabStripModelObserver,
@@ -869,11 +892,19 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -389,7 +389,7 @@ index b0fdd85964754..f86896354ec6f 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1279,6 +1310,8 @@ class Browser : public TabStripModelObserver,
@@ -1281,6 +1312,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@ -398,7 +398,7 @@ index b0fdd85964754..f86896354ec6f 100644
CreationSource creation_source_ = CreationSource::kUnknown;
UnloadController unload_controller_;
@@ -1343,6 +1376,10 @@ class Browser : public TabStripModelObserver,
@@ -1348,6 +1381,10 @@ class Browser : public TabStripModelObserver,
extension_browser_window_helper_;
#endif
@ -410,7 +410,7 @@ index b0fdd85964754..f86896354ec6f 100644
// The opener browser of the document picture-in-picture browser. Null if the
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index d4f4ba7efd1be..4b0834aceed14 100644
index 88edd87bcb2d0..26f9d74bd4ed9 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -556,6 +556,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(