diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 083775681..21908605c 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # 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' } diff --git a/libcef/browser/extensions/extensions_browser_client.cc b/libcef/browser/extensions/extensions_browser_client.cc index 6355b0ffb..f99d711f7 100644 --- a/libcef/browser/extensions/extensions_browser_client.cc +++ b/libcef/browser/extensions/extensions_browser_client.cc @@ -118,8 +118,8 @@ bool CefExtensionsBrowserClient::AreExtensionsDisabled( return false; } -bool CefExtensionsBrowserClient::IsValidContext(BrowserContext* context) { - return GetOriginalContext(context) != nullptr; +bool CefExtensionsBrowserClient::IsValidContext(void* context) { + return GetOriginalContext(static_cast(context)) != nullptr; } bool CefExtensionsBrowserClient::IsSameContext(BrowserContext* first, diff --git a/libcef/browser/extensions/extensions_browser_client.h b/libcef/browser/extensions/extensions_browser_client.h index f84a02464..0168c60c6 100644 --- a/libcef/browser/extensions/extensions_browser_client.h +++ b/libcef/browser/extensions/extensions_browser_client.h @@ -31,7 +31,7 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient { bool IsShuttingDown() override; bool AreExtensionsDisabled(const base::CommandLine& command_line, content::BrowserContext* context) override; - bool IsValidContext(content::BrowserContext* context) override; + bool IsValidContext(void* context) override; bool IsSameContext(content::BrowserContext* first, content::BrowserContext* second) override; bool HasOffTheRecordContext(content::BrowserContext* context) override; diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 9dccbb838..105a340b9 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -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 -index 55c2762426eaa..d2a6f69ad70aa 100644 +index 619f741f15097..79356428c64bf 100644 --- 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 { bool painted = TopContainerBackground::PaintThemeCustomImage( canvas, view, browser_view_, /*translate_view_coordinates=*/false); @@ -693,7 +693,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644 SkColor frame_color = browser_view_->frame()->GetFrameView()->GetFrameColor( BrowserFrameActiveState::kUseCurrent); -@@ -208,12 +208,13 @@ class ToolbarView::ContainerView : public views::View { +@@ -226,12 +226,13 @@ class ToolbarView::ContainerView : public views::View { //////////////////////////////////////////////////////////////////////////////// // ToolbarView, public: @@ -709,7 +709,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644 SetID(VIEW_ID_TOOLBAR); container_view_ = AddChildView(std::make_unique()); -@@ -238,6 +239,19 @@ ToolbarView::~ToolbarView() { +@@ -256,6 +257,19 @@ ToolbarView::~ToolbarView() { } void ToolbarView::Init() { @@ -729,7 +729,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644 #if defined(USE_AURA) // Avoid generating too many occlusion tracking calculation events before 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( browser_, browser_->profile(), browser_->command_controller(), this, @@ -745,7 +745,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644 download_button = std::make_unique(browser_view_); } -@@ -349,8 +364,10 @@ void ToolbarView::Init() { +@@ -367,8 +382,10 @@ void ToolbarView::Init() { } } std::unique_ptr cast; @@ -757,7 +757,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644 std::unique_ptr media_button; 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_button; @@ -767,7 +767,7 @@ index 55c2762426eaa..d2a6f69ad70aa 100644 send_tab_to_self_button = std::make_unique( browser_view_); -@@ -368,7 +386,7 @@ void ToolbarView::Init() { +@@ -386,7 +404,7 @@ void ToolbarView::Init() { std::unique_ptr side_panel_button; std::unique_ptr side_panel_toolbar_container; diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 4e30dd9b5..b36c91177 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -198,7 +198,7 @@ index c3197eb4790fa..1e7ae767b0582 100644 } 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 @@ -32,6 +32,7 @@ @@ -217,7 +217,7 @@ index c8b79578252a9..fbfac71f6a861 100644 class ExtensionHostDelegate; class ExtensionSet; class ExtensionSystem; -@@ -263,6 +265,14 @@ class ExtensionsBrowserClient { +@@ -265,6 +267,14 @@ class ExtensionsBrowserClient { virtual std::unique_ptr CreateExtensionHostDelegate() = 0; diff --git a/patch/patches/trace_event.patch b/patch/patches/trace_event.patch index ceb08e76c..c558e38e2 100644 --- a/patch/patches/trace_event.patch +++ b/patch/patches/trace_event.patch @@ -1,5 +1,5 @@ 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 @@ -64,6 +64,8 @@