Skip to content

Commit

Permalink
Update to Chromium version 93.0.4577.25
Browse files Browse the repository at this point in the history
  • Loading branch information
CEF Spotify authored and magreenblatt committed Aug 5, 2021
1 parent 2565243 commit e747782
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 36 deletions.
2 changes: 1 addition & 1 deletion CHROMIUM_BUILD_COMPATIBILITY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding

{
'chromium_checkout': 'refs/tags/93.0.4577.18',
'chromium_checkout': 'refs/tags/93.0.4577.25',
'depot_tools_checkout': '45d2afa080'
}
6 changes: 3 additions & 3 deletions patch/patches/base_sandbox_2743.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index 576bd49a6198..d5872f293f7c 100644
index 1c989c7e9221..b8b637397f61 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -34,6 +34,7 @@ import("//build/config/ui.gni")
Expand All @@ -10,7 +10,7 @@ index 576bd49a6198..d5872f293f7c 100644
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
@@ -1731,7 +1732,11 @@ component("base") {
@@ -1733,7 +1734,11 @@ component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]
Expand All @@ -23,7 +23,7 @@ index 576bd49a6198..d5872f293f7c 100644
sources += [
"hash/md5_nacl.cc",
"hash/md5_nacl.h",
@@ -1978,6 +1983,12 @@ component("base") {
@@ -1980,6 +1985,12 @@ component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
}

Expand Down
10 changes: 5 additions & 5 deletions patch/patches/chrome_browser_context_menus.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 00cffaf573b2..e324126c2dae 100644
index 7029436a258c..99e09f3b6523 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -274,6 +274,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
Expand Down Expand Up @@ -42,7 +42,7 @@ index 00cffaf573b2..e324126c2dae 100644
}

RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1024,6 +1043,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1025,6 +1044,12 @@ void RenderViewContextMenu::InitMenu() {
// menu, meaning that each menu item added/removed in this function will cause
// it to visibly jump on the screen (see b/173569669).
AppendQuickAnswersItems();
Expand All @@ -55,7 +55,7 @@ index 00cffaf573b2..e324126c2dae 100644
}

Profile* RenderViewContextMenu::GetProfile() const {
@@ -2744,6 +2769,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
@@ -2745,6 +2770,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
*GetMenuShownCallback() = std::move(cb);
}

Expand All @@ -69,7 +69,7 @@ index 00cffaf573b2..e324126c2dae 100644
RenderViewContextMenu::GetHandlersForLinkUrl() {
ProtocolHandlerRegistry::ProtocolHandlerList handlers =
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
index 34b6152a222e..b03c81bd076b 100644
index 7b6f19105c8e..277b2f4e95a4 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -101,6 +101,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
Expand All @@ -85,7 +85,7 @@ index 34b6152a222e..b03c81bd076b 100644
protected:
Profile* GetProfile() const;

@@ -296,6 +302,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
@@ -297,6 +303,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase,
// built.
bool is_protocol_submenu_valid_ = false;

Expand Down
2 changes: 1 addition & 1 deletion patch/patches/chrome_runtime_views.patch
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ index 0ce7abdeb7d9..8197a6bb7da9 100644

// Initialize the frame (creates the underlying native window).
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index 338c049c8116..6a1a97b37573 100644
index 18c19c28cddd..c07387019480 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -589,11 +589,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
Expand Down
6 changes: 3 additions & 3 deletions patch/patches/content_2015.patch
Original file line number Diff line number Diff line change
Expand Up @@ -188,18 +188,18 @@ index 632ae86c6fd6..55b749ec1242 100644
const std::vector<WebPluginInfo>& all_plugins);

diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
index 33b210a8bba5..4b13dc734b67 100644
index ee638fbd09ad..ef1a5567a0fa 100644
--- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -11954,6 +11954,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
@@ -11960,6 +11960,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
}

void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
+ bool is_main_frame,
const url::Origin& main_frame_origin,
const std::string& mime_type,
GetPluginInfoCallback callback) {
@@ -11961,7 +11962,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -11967,7 +11968,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
WebPluginInfo info;
std::string actual_mime_type;
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
Expand Down
12 changes: 6 additions & 6 deletions patch/patches/print_preview_123.patch
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ index 4ff73fd2d9ec..d56686d8284b 100644
// Add an entry to the map.
preview_dialog_map_[preview_dialog] = initiator;
diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
index 867227684ddb..98986fdad1e7 100644
index e345c611cac0..373b1b92cc55 100644
--- chrome/browser/printing/print_view_manager_base.cc
+++ chrome/browser/printing/print_view_manager_base.cc
@@ -21,6 +21,7 @@
Expand Down Expand Up @@ -97,10 +97,10 @@ index 867227684ddb..98986fdad1e7 100644

void NotifySystemDialogCancelled(int render_process_id, int routing_id) {
diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
index 48e2baa05cdf..b4da112845d8 100644
index eaa0e162a339..8e030d2ab399 100644
--- chrome/browser/printing/print_view_manager_base.h
+++ chrome/browser/printing/print_view_manager_base.h
@@ -124,9 +124,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
@@ -126,9 +126,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
// Manages the low-level talk to the printer.
scoped_refptr<PrintJob> print_job_;

Expand Down Expand Up @@ -304,7 +304,7 @@ index e326047aef5e..4fc8898e95b6 100644
base::FilePath GetSaveLocation() const;

diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 5cebaa1d75b7..3c2fae113c67 100644
index 83707d6c0c68..3c17f84d0fa7 100644
--- chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -25,6 +25,7 @@
Expand All @@ -315,15 +315,15 @@ index 5cebaa1d75b7..3c2fae113c67 100644
#include "chrome/browser/account_manager_facade_factory.h"
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/bad_message.h"
@@ -1151,6 +1152,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
@@ -1154,6 +1155,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
}
#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
if (printer_type == mojom::PrinterType::kPrivet &&
+ !cef::IsAlloyRuntimeEnabled() &&
GetPrefs()->GetBoolean(prefs::kForceEnablePrivetPrinting)) {
if (!privet_printer_handler_) {
privet_printer_handler_ =
@@ -1158,6 +1160,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
@@ -1161,6 +1163,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
}
return privet_printer_handler_.get();
}
Expand Down
13 changes: 0 additions & 13 deletions patch/patches/runhooks.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
diff --git .vpython3 .vpython3
index 14faab39343e..0aeeb03f79bd 100644
--- .vpython3
+++ .vpython3
@@ -204,7 +204,7 @@ wheel <

wheel <
name: "infra/python/wheels/py-py2_py3"
- version: "version:1.5.3"
+ version: "version:1.10.0"
>

wheel <
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
index c1d2fa2ce0aa..d1d215f35ac1 100644
--- build/toolchain/win/setup_toolchain.py
Expand Down
4 changes: 2 additions & 2 deletions patch/patches/views_widget.patch
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ index 20bcac8ebadf..f36e48dbf654 100644
// a reference.
corewm::TooltipWin* tooltip_;
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index a742d7d7f5d5..ac66f0cb1800 100644
index 4b7f2bbe19ab..2ddfa798af91 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -332,7 +332,8 @@ void Widget::Init(InitParams params) {
Expand Down Expand Up @@ -317,7 +317,7 @@ index a742d7d7f5d5..ac66f0cb1800 100644
}

diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index d6ce8c4934ed..773125ba2dd5 100644
index 4a1527951ae3..893682be9bff 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -326,6 +326,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
Expand Down
4 changes: 2 additions & 2 deletions patch/patches/webview_plugin_2020.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 220e8eed1ff4..2191e5bd8fcd 100644
index d8488d90dc96..2401d987baae 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5286,7 +5286,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -5287,7 +5287,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
Expand Down

0 comments on commit e747782

Please sign in to comment.