bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-21 14:40:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 117.0.5938.22

Browse Source
This commit is contained in:
Marshall Greenblatt 2023-08-29 18:53:06 -04:00
parent 53a890ff2c
commit 5f8d100619
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/117.0.5938.11', 'chromium_checkout': 'refs/tags/117.0.5938.22',
'depot_tools_checkout': 'd9011c559b' 'depot_tools_checkout': 'd9011c559b'
} }

4
libcef/browser/extensions/extensions_browser_client.cc
View File

@ -118,8 +118,8 @@ bool CefExtensionsBrowserClient::AreExtensionsDisabled(
return false; return false;
} }
bool CefExtensionsBrowserClient::IsValidContext(BrowserContext* context) { bool CefExtensionsBrowserClient::IsValidContext(void* context) {
return GetOriginalContext(context) != nullptr; return GetOriginalContext(static_cast<BrowserContext*>(context)) != nullptr;
} }
bool CefExtensionsBrowserClient::IsSameContext(BrowserContext* first, bool CefExtensionsBrowserClient::IsSameContext(BrowserContext* first,

2
libcef/browser/extensions/extensions_browser_client.h
View File

@ -31,7 +31,7 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
bool IsShuttingDown() override; bool IsShuttingDown() override;
bool AreExtensionsDisabled(const base::CommandLine& command_line, bool AreExtensionsDisabled(const base::CommandLine& command_line,
content::BrowserContext* context) override; content::BrowserContext* context) override;
bool IsValidContext(content::BrowserContext* context) override; bool IsValidContext(void* context) override;
bool IsSameContext(content::BrowserContext* first, bool IsSameContext(content::BrowserContext* first,
content::BrowserContext* second) override; content::BrowserContext* second) override;
bool HasOffTheRecordContext(content::BrowserContext* context) override; bool HasOffTheRecordContext(content::BrowserContext* context) override;

16
patch/patches/chrome_runtime_views.patch
View File

@ -681,10 +681,10 @@ index dc792bea0ab88..e02cdd3214b1d 100644
} }
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index 55c2762426eaa..d2a6f69ad70aa 100644 index 619f741f15097..79356428c64bf 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc --- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -182,7 +182,7 @@ class TabstripLikeBackground : public views::Background { @@ -190,7 +190,7 @@ class TabstripLikeBackground : public views::Background {
void Paint(gfx::Canvas* canvas, views::View* view) const override { void Paint(gfx::Canvas* canvas, views::View* view) const override {
bool painted = TopContainerBackground::PaintThemeCustomImage( bool painted = TopContainerBackground::PaintThemeCustomImage(
canvas, view, browser_view_, /*translate_view_coordinates=*/false); canvas, view, browser_view_, /*translate_view_coordinates=*/false);
@ -693,7 +693,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644
SkColor frame_color = SkColor frame_color =
browser_view_->frame()->GetFrameView()->GetFrameColor( browser_view_->frame()->GetFrameView()->GetFrameColor(
BrowserFrameActiveState::kUseCurrent); BrowserFrameActiveState::kUseCurrent);
@@ -208,12 +208,13 @@ class ToolbarView::ContainerView : public views::View { @@ -226,12 +226,13 @@ class ToolbarView::ContainerView : public views::View {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ToolbarView, public: // ToolbarView, public:
@ -709,7 +709,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644
SetID(VIEW_ID_TOOLBAR); SetID(VIEW_ID_TOOLBAR);
container_view_ = AddChildView(std::make_unique<ContainerView>()); container_view_ = AddChildView(std::make_unique<ContainerView>());
@@ -238,6 +239,19 @@ ToolbarView::~ToolbarView() { @@ -256,6 +257,19 @@ ToolbarView::~ToolbarView() {
} }
void ToolbarView::Init() { void ToolbarView::Init() {
@ -729,7 +729,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644
#if defined(USE_AURA) #if defined(USE_AURA)
// Avoid generating too many occlusion tracking calculation events before this // Avoid generating too many occlusion tracking calculation events before this
// function returns. The occlusion status will be computed only once once this // function returns. The occlusion status will be computed only once once this
@@ -262,12 +276,13 @@ void ToolbarView::Init() { @@ -280,12 +294,13 @@ void ToolbarView::Init() {
auto location_bar = std::make_unique<LocationBarView>( auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this, browser_, browser_->profile(), browser_->command_controller(), this,
@ -745,7 +745,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644
download_button = download_button =
std::make_unique<DownloadToolbarButtonView>(browser_view_); std::make_unique<DownloadToolbarButtonView>(browser_view_);
} }
@@ -349,8 +364,10 @@ void ToolbarView::Init() { @@ -367,8 +382,10 @@ void ToolbarView::Init() {
} }
} }
std::unique_ptr<media_router::CastToolbarButton> cast; std::unique_ptr<media_router::CastToolbarButton> cast;
@ -757,7 +757,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644
std::unique_ptr<MediaToolbarButtonView> media_button; std::unique_ptr<MediaToolbarButtonView> media_button;
if (base::FeatureList::IsEnabled(media::kGlobalMediaControls)) { if (base::FeatureList::IsEnabled(media::kGlobalMediaControls)) {
@@ -360,7 +377,8 @@ void ToolbarView::Init() { @@ -378,7 +395,8 @@ void ToolbarView::Init() {
std::unique_ptr<send_tab_to_self::SendTabToSelfToolbarIconView> std::unique_ptr<send_tab_to_self::SendTabToSelfToolbarIconView>
send_tab_to_self_button; send_tab_to_self_button;
@ -767,7 +767,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644
send_tab_to_self_button = send_tab_to_self_button =
std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>( std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>(
browser_view_); browser_view_);
@@ -368,7 +386,7 @@ void ToolbarView::Init() { @@ -386,7 +404,7 @@ void ToolbarView::Init() {
std::unique_ptr<SidePanelToolbarButton> side_panel_button; std::unique_ptr<SidePanelToolbarButton> side_panel_button;
std::unique_ptr<SidePanelToolbarContainer> side_panel_toolbar_container; std::unique_ptr<SidePanelToolbarContainer> side_panel_toolbar_container;

4
patch/patches/extensions_1947.patch
View File

@ -198,7 +198,7 @@ index c3197eb4790fa..1e7ae767b0582 100644
} }
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index c8b79578252a9..fbfac71f6a861 100644 index 058367b7ab78d..99a9e901566ce 100644
--- extensions/browser/extensions_browser_client.h --- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h +++ extensions/browser/extensions_browser_client.h
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
@ -217,7 +217,7 @@ index c8b79578252a9..fbfac71f6a861 100644
class ExtensionHostDelegate; class ExtensionHostDelegate;
class ExtensionSet; class ExtensionSet;
class ExtensionSystem; class ExtensionSystem;
@@ -263,6 +265,14 @@ class ExtensionsBrowserClient { @@ -265,6 +267,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate> virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0; CreateExtensionHostDelegate() = 0;

2
patch/patches/trace_event.patch
View File

@ -1,5 +1,5 @@
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
index 1ddaeafd2779a..4feee8b931fd4 100644 index 5d1c694fba219..f0fa55370ab13 100644
--- base/trace_event/builtin_categories.h --- base/trace_event/builtin_categories.h
+++ base/trace_event/builtin_categories.h +++ base/trace_event/builtin_categories.h
@@ -64,6 +64,8 @@ @@ -64,6 +64,8 @@