Update to Chromium version 113.0.5672.128
This commit is contained in:
parent
f37637fada
commit
525fa10dfc
|
@ -7,6 +7,6 @@
|
||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/113.0.5672.93',
|
'chromium_checkout': 'refs/tags/113.0.5672.128',
|
||||||
'depot_tools_checkout': '2075f733e8'
|
'depot_tools_checkout': '2075f733e8'
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,10 +20,10 @@ index 2cc2e8e2a16da..b9484a5832f74 100644
|
||||||
|
|
||||||
// Make an exception to allow most visited tiles to commit in
|
// Make an exception to allow most visited tiles to commit in
|
||||||
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
||||||
index 211f098c4fb7e..68d68615bf6df 100644
|
index bfead21ad8426..d3d3ff5e4effd 100644
|
||||||
--- content/browser/renderer_host/navigation_request.cc
|
--- content/browser/renderer_host/navigation_request.cc
|
||||||
+++ content/browser/renderer_host/navigation_request.cc
|
+++ content/browser/renderer_host/navigation_request.cc
|
||||||
@@ -7146,10 +7146,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
@@ -7152,10 +7152,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||||
bool use_opaque_origin =
|
bool use_opaque_origin =
|
||||||
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
|
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
|
||||||
network::mojom::WebSandboxFlags::kOrigin;
|
network::mojom::WebSandboxFlags::kOrigin;
|
||||||
|
@ -47,7 +47,7 @@ index 211f098c4fb7e..68d68615bf6df 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
return origin_and_debug_info;
|
return origin_and_debug_info;
|
||||||
@@ -7179,6 +7191,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
@@ -7185,6 +7197,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
||||||
GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
|
||||||
SandboxFlagsToCommit());
|
SandboxFlagsToCommit());
|
||||||
|
|
||||||
|
|
|
@ -105,10 +105,10 @@ index ad5f1925735fd..a871f4a7792a7 100644
|
||||||
BrowserPluginEmbedder(const BrowserPluginEmbedder&) = delete;
|
BrowserPluginEmbedder(const BrowserPluginEmbedder&) = delete;
|
||||||
BrowserPluginEmbedder& operator=(const BrowserPluginEmbedder&) = delete;
|
BrowserPluginEmbedder& operator=(const BrowserPluginEmbedder&) = delete;
|
||||||
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
|
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
|
||||||
index a7501a57c5149..1c148767f67a6 100644
|
index 2e47c128f4d5c..c27d76a8227f9 100644
|
||||||
--- content/browser/browser_plugin/browser_plugin_guest.cc
|
--- content/browser/browser_plugin/browser_plugin_guest.cc
|
||||||
+++ content/browser/browser_plugin/browser_plugin_guest.cc
|
+++ content/browser/browser_plugin/browser_plugin_guest.cc
|
||||||
@@ -80,6 +80,8 @@ void BrowserPluginGuest::InitInternal(WebContentsImpl* owner_web_contents) {
|
@@ -81,6 +81,8 @@ void BrowserPluginGuest::InitInternal(WebContentsImpl* owner_web_contents) {
|
||||||
GetWebContents()->GetOrCreateWebPreferences();
|
GetWebContents()->GetOrCreateWebPreferences();
|
||||||
prefs.navigate_on_drag_drop = false;
|
prefs.navigate_on_drag_drop = false;
|
||||||
GetWebContents()->SetWebPreferences(prefs);
|
GetWebContents()->SetWebPreferences(prefs);
|
||||||
|
@ -118,7 +118,7 @@ index a7501a57c5149..1c148767f67a6 100644
|
||||||
|
|
||||||
BrowserPluginGuest::~BrowserPluginGuest() = default;
|
BrowserPluginGuest::~BrowserPluginGuest() = default;
|
||||||
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
|
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
|
||||||
index 17e98b60e8f7e..41f05cdd88d40 100644
|
index 7f3083029d45e..94a5cbed96a10 100644
|
||||||
--- content/browser/browser_plugin/browser_plugin_guest.h
|
--- content/browser/browser_plugin/browser_plugin_guest.h
|
||||||
+++ content/browser/browser_plugin/browser_plugin_guest.h
|
+++ content/browser/browser_plugin/browser_plugin_guest.h
|
||||||
@@ -70,6 +70,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
@@ -70,6 +70,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
||||||
|
@ -130,10 +130,10 @@ index 17e98b60e8f7e..41f05cdd88d40 100644
|
||||||
private:
|
private:
|
||||||
// BrowserPluginGuest is a WebContentsObserver of |web_contents| and
|
// BrowserPluginGuest is a WebContentsObserver of |web_contents| and
|
||||||
// |web_contents| has to stay valid for the lifetime of BrowserPluginGuest.
|
// |web_contents| has to stay valid for the lifetime of BrowserPluginGuest.
|
||||||
@@ -79,6 +81,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
@@ -80,6 +82,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
||||||
void InitInternal(WebContentsImpl* owner_web_contents);
|
|
||||||
|
|
||||||
const raw_ptr<BrowserPluginGuestDelegate, DanglingUntriaged> delegate_;
|
// May be null during guest destruction.
|
||||||
|
const base::WeakPtr<BrowserPluginGuestDelegate> delegate_;
|
||||||
+
|
+
|
||||||
+ raw_ptr<WebContentsImpl> owner_web_contents_ = nullptr;
|
+ raw_ptr<WebContentsImpl> owner_web_contents_ = nullptr;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
|
diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
|
||||||
index 4b7fcf619a55d..139fd5b4a2bd0 100644
|
index 37d7897e01411..e40e65d09917d 100644
|
||||||
--- chrome/browser/download/download_prefs.cc
|
--- chrome/browser/download/download_prefs.cc
|
||||||
+++ chrome/browser/download/download_prefs.cc
|
+++ chrome/browser/download/download_prefs.cc
|
||||||
@@ -24,6 +24,7 @@
|
@@ -23,6 +23,7 @@
|
||||||
#include "base/strings/utf_string_conversions.h"
|
#include "base/strings/utf_string_conversions.h"
|
||||||
#include "build/build_config.h"
|
#include "build/build_config.h"
|
||||||
#include "build/chromeos_buildflags.h"
|
#include "build/chromeos_buildflags.h"
|
||||||
|
@ -10,7 +10,7 @@ index 4b7fcf619a55d..139fd5b4a2bd0 100644
|
||||||
#include "chrome/browser/download/chrome_download_manager_delegate.h"
|
#include "chrome/browser/download/chrome_download_manager_delegate.h"
|
||||||
#include "chrome/browser/download/download_core_service_factory.h"
|
#include "chrome/browser/download/download_core_service_factory.h"
|
||||||
#include "chrome/browser/download/download_core_service_impl.h"
|
#include "chrome/browser/download/download_core_service_impl.h"
|
||||||
@@ -64,6 +65,10 @@
|
@@ -63,6 +64,10 @@
|
||||||
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
|
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ index 4b7fcf619a55d..139fd5b4a2bd0 100644
|
||||||
using content::BrowserContext;
|
using content::BrowserContext;
|
||||||
using content::BrowserThread;
|
using content::BrowserThread;
|
||||||
using content::DownloadManager;
|
using content::DownloadManager;
|
||||||
@@ -358,6 +363,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
|
@@ -354,6 +359,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
|
||||||
// static
|
// static
|
||||||
DownloadPrefs* DownloadPrefs::FromBrowserContext(
|
DownloadPrefs* DownloadPrefs::FromBrowserContext(
|
||||||
content::BrowserContext* context) {
|
content::BrowserContext* context) {
|
||||||
|
|
Loading…
Reference in New Issue