mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 92.0.4515.131
This commit is contained in:
committed by
Marshall Greenblatt
parent
01c8529f74
commit
4045acff92
@@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/92.0.4515.107',
|
||||
'chromium_checkout': 'refs/tags/92.0.4515.131',
|
||||
'depot_tools_checkout': '58542b7fef'
|
||||
}
|
||||
|
@@ -20,10 +20,10 @@ index d548b3d7e0a0..cb93301271cd 100644
|
||||
|
||||
// TODO(wjmaclean): We should update the ProcessLock comparison API
|
||||
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
|
||||
index a3d8dd6b2543..c6a3237025a8 100644
|
||||
index 7963b39ec4e7..39e3c664f127 100644
|
||||
--- content/browser/renderer_host/navigation_request.cc
|
||||
+++ content/browser/renderer_host/navigation_request.cc
|
||||
@@ -5313,6 +5313,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() {
|
||||
@@ -5314,6 +5314,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() {
|
||||
|
||||
// Calculate an approximation of the origin. The sandbox/csp are ignored.
|
||||
url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
|
||||
|
@@ -188,10 +188,10 @@ 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 9f68f4f7fa57..12321ffb3934 100644
|
||||
index f7fe7e4a2790..c78ad7b958a0 100644
|
||||
--- content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -11305,6 +11305,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
||||
@@ -11308,6 +11308,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
||||
}
|
||||
|
||||
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||
@@ -199,7 +199,7 @@ index 9f68f4f7fa57..12321ffb3934 100644
|
||||
const url::Origin& main_frame_origin,
|
||||
const std::string& mime_type,
|
||||
GetPluginInfoCallback callback) {
|
||||
@@ -11312,7 +11313,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||
@@ -11315,7 +11316,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||
WebPluginInfo info;
|
||||
std::string actual_mime_type;
|
||||
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
|
||||
index 563674ae9631..953c378ff7e5 100644
|
||||
index a090b51cadf8..e62f1ea2db1c 100644
|
||||
--- base/trace_event/builtin_categories.h
|
||||
+++ base/trace_event/builtin_categories.h
|
||||
@@ -61,6 +61,8 @@
|
||||
|
Reference in New Issue
Block a user