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 98.0.4758.0 (#950365)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-12-16 17:35:54 -05:00
parent b76badd958
commit dfc0131516
109 changed files with 785 additions and 798 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 9e534ff1683f1..de406f5879be0 100644
return false;
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 030680ad08612..2dc5a81b00618 100644
index 8f6301f12fb2b..ff584e38b1874 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -267,6 +267,20 @@
@@ -264,6 +264,20 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@@ -37,7 +37,7 @@ index 030680ad08612..2dc5a81b00618 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -499,6 +513,13 @@ Browser::Browser(const CreateParams& params)
@@ -500,6 +514,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this);
@@ -51,7 +51,7 @@ index 030680ad08612..2dc5a81b00618 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1321,6 +1342,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1322,6 +1343,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@@ -66,7 +66,7 @@ index 030680ad08612..2dc5a81b00618 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1328,8 +1357,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1329,8 +1358,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -87,7 +87,7 @@ index 030680ad08612..2dc5a81b00618 100644
}
bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1550,6 +1589,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1535,6 +1574,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params);
}
@@ -102,7 +102,7 @@ index 030680ad08612..2dc5a81b00618 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1649,6 +1696,15 @@ void Browser::AddNewContents(WebContents* source,
@@ -1634,6 +1681,15 @@ void Browser::AddNewContents(WebContents* source,
source, disposition);
}
@@ -118,16 +118,16 @@ index 030680ad08612..2dc5a81b00618 100644
chrome::AddWebContents(this, source, std::move(new_contents), target_url,
disposition, initial_rect);
}
@@ -1667,6 +1723,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool to_different_document) {
@@ -1652,6 +1708,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, to_different_document);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
+
+ CALL_CEF_DELEGATE(LoadingStateChanged, source, to_different_document);
+ CALL_CEF_DELEGATE(LoadingStateChanged, source, should_show_loading_ui);
}
void Browser::CloseContents(WebContents* source) {
@@ -1694,6 +1752,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1679,6 +1737,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -136,7 +136,7 @@ index 030680ad08612..2dc5a81b00618 100644
if (!GetStatusBubble())
return;
@@ -1701,6 +1761,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1686,6 +1746,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@@ -154,7 +154,7 @@ index 030680ad08612..2dc5a81b00618 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1817,6 +1888,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1802,6 +1873,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 030680ad08612..2dc5a81b00618 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1859,6 +1934,8 @@ void Browser::RendererResponsive(
@@ -1846,6 +1921,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -174,7 +174,7 @@ index 030680ad08612..2dc5a81b00618 100644
}
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1898,11 +1975,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -1892,11 +1969,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 030680ad08612..2dc5a81b00618 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2745,6 +2826,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2739,6 +2820,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 030680ad08612..2dc5a81b00618 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 0c31ee896f98e..2e24c282103ac 100644
index 10e4e2021cb39..7b727fecc3a48 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -21,6 +21,7 @@
@@ -222,7 +222,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
#if defined(OS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -291,6 +296,11 @@ class Browser : public TabStripModelObserver,
@@ -292,6 +297,11 @@ class Browser : public TabStripModelObserver,
// maximizable.
bool can_maximize = true;
@@ -234,7 +234,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -358,6 +368,13 @@ class Browser : public TabStripModelObserver,
@@ -359,6 +369,13 @@ class Browser : public TabStripModelObserver,
return creation_source_ == CreationSource::kSessionRestore;
}
@@ -248,7 +248,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -431,6 +448,12 @@ class Browser : public TabStripModelObserver,
@@ -432,6 +449,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
@@ -261,7 +261,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -798,6 +821,11 @@ class Browser : public TabStripModelObserver,
@@ -796,6 +819,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,7 +273,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
void ContentsMouseEvent(content::WebContents* source,
bool motion,
bool exited) override;
@@ -1190,6 +1218,8 @@ class Browser : public TabStripModelObserver,
@@ -1191,6 +1219,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@@ -282,7 +282,7 @@ index 0c31ee896f98e..2e24c282103ac 100644
CreationSource creation_source_ = CreationSource::kUnknown;
UnloadController unload_controller_;
@@ -1247,6 +1277,10 @@ class Browser : public TabStripModelObserver,
@@ -1252,6 +1282,10 @@ class Browser : public TabStripModelObserver,
extension_browser_window_helper_;
#endif
@@ -294,10 +294,10 @@ index 0c31ee896f98e..2e24c282103ac 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 fe7825b8253d3..1e0f20e653266 100644
index 7086ea81b8504..6d81f99416b73 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -451,6 +451,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -452,6 +452,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
std::unique_ptr<WebContents> target_contents =
WebContents::Create(create_params);