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 93.0.4577.0 (#902210)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-07-23 12:40:13 -04:00
parent 1ffa5528b3
commit b4ea0496e7
141 changed files with 1188 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
patch/patches/chrome_browser_browser.patch
View File

@ -13,10 +13,10 @@ index ba0c5c3fc0446..b4df9af95ecd1 100644
return false;
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 268f6547ff84b..29e1b4b1b4dba 100644
index 8fdddbadf5e9a..4c5ea3c875db2 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -263,6 +263,20 @@
@@ -262,6 +262,20 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@ -37,7 +37,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -492,6 +506,13 @@ Browser::Browser(const CreateParams& params)
@@ -491,6 +505,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this);
@ -51,7 +51,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1336,6 +1357,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1325,6 +1346,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@ -66,7 +66,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1343,8 +1372,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1332,8 +1361,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -87,7 +87,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
}
bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1569,6 +1608,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1558,6 +1597,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params);
}
@ -102,7 +102,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1668,6 +1715,15 @@ void Browser::AddNewContents(WebContents* source,
@@ -1657,6 +1704,15 @@ void Browser::AddNewContents(WebContents* source,
source, disposition);
}
@ -118,7 +118,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
chrome::AddWebContents(this, source, std::move(new_contents), target_url,
disposition, initial_rect);
}
@@ -1686,6 +1742,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1675,6 +1731,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool to_different_document) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, to_different_document);
@ -127,7 +127,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1713,6 +1771,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1702,6 +1760,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -136,7 +136,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
if (!GetStatusBubble())
return;
@@ -1720,6 +1780,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1709,6 +1769,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@ -154,7 +154,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1836,6 +1907,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1825,6 +1896,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -165,7 +165,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1872,6 +1947,8 @@ void Browser::RendererResponsive(
@@ -1861,6 +1936,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@ -174,7 +174,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
}
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1918,11 +1995,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -1907,11 +1984,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -190,7 +190,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2767,6 +2848,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2756,6 +2837,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
content_translate_driver->RemoveTranslationObserver(this);
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
}
@ -200,7 +200,7 @@ index 268f6547ff84b..29e1b4b1b4dba 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 946c447afbde1..cce4aaade2ea3 100644
index 2908b4b70815d..9eb3be7b231ad 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -21,6 +21,7 @@
@ -222,7 +222,7 @@ index 946c447afbde1..cce4aaade2ea3 100644
#if defined(OS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -274,6 +279,11 @@ class Browser : public TabStripModelObserver,
@@ -283,6 +288,11 @@ class Browser : public TabStripModelObserver,
// maximizable.
bool can_maximize = true;
@ -234,9 +234,9 @@ index 946c447afbde1..cce4aaade2ea3 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -338,6 +348,13 @@ class Browser : public TabStripModelObserver,
bool is_focus_mode() const { return is_focus_mode_; }
@@ -347,6 +357,13 @@ class Browser : public TabStripModelObserver,
return creation_source_ == CreationSource::kSessionRestore;
}
+ // Return true if CEF will expose the toolbar to the client. This value is
+ // used to selectively enable toolbar behaviors such as command processing
@ -248,7 +248,7 @@ index 946c447afbde1..cce4aaade2ea3 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -396,6 +413,12 @@ class Browser : public TabStripModelObserver,
@@ -407,6 +424,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
@ -261,7 +261,7 @@ index 946c447afbde1..cce4aaade2ea3 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -777,6 +800,11 @@ class Browser : public TabStripModelObserver,
@@ -789,6 +812,11 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -273,16 +273,16 @@ index 946c447afbde1..cce4aaade2ea3 100644
void ContentsMouseEvent(content::WebContents* source,
bool motion,
bool exited) override;
@@ -1167,6 +1195,8 @@ class Browser : public TabStripModelObserver,
@@ -1180,6 +1208,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
+ bool toolbar_overridden_ = false;
+
// Tracks when this browser is being created by session restore.
bool is_session_restore_;
CreationSource creation_source_ = CreationSource::kUnknown;
@@ -1227,6 +1257,10 @@ class Browser : public TabStripModelObserver,
UnloadController unload_controller_;
@@ -1237,6 +1267,10 @@ class Browser : public TabStripModelObserver,
extension_browser_window_helper_;
#endif
@ -294,7 +294,7 @@ index 946c447afbde1..cce4aaade2ea3 100644
// The following factory is used for chrome update coalescing.
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index 29890d8b342a4..514affa254df4 100644
index a4af0836da1aa..bdf26e401d563 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -456,6 +456,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(