mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-23 07:27:42 +01:00
Update to Chromium version 94.0.4606.61
This commit is contained in:
parent
4b61a8c493
commit
6a963ca044
@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/94.0.4606.54',
|
'chromium_checkout': 'refs/tags/94.0.4606.61',
|
||||||
'depot_tools_checkout': '64a9f33bdd'
|
'depot_tools_checkout': '64a9f33bdd'
|
||||||
}
|
}
|
||||||
|
@ -188,10 +188,10 @@ index 632ae86c6fd69..55b749ec12421 100644
|
|||||||
const std::vector<WebPluginInfo>& all_plugins);
|
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
|
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index a0cfdfbe05515..e6230526ab321 100644
|
index 3e7b18a7f9ba4..b4ffb4b2a78ac 100644
|
||||||
--- content/browser/renderer_host/render_frame_host_impl.cc
|
--- content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -12074,6 +12074,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
@@ -12082,6 +12082,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
||||||
}
|
}
|
||||||
|
|
||||||
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||||
@ -199,7 +199,7 @@ index a0cfdfbe05515..e6230526ab321 100644
|
|||||||
const url::Origin& main_frame_origin,
|
const url::Origin& main_frame_origin,
|
||||||
const std::string& mime_type,
|
const std::string& mime_type,
|
||||||
GetPluginInfoCallback callback) {
|
GetPluginInfoCallback callback) {
|
||||||
@@ -12081,7 +12082,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
@@ -12089,7 +12090,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||||
WebPluginInfo info;
|
WebPluginInfo info;
|
||||||
std::string actual_mime_type;
|
std::string actual_mime_type;
|
||||||
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
|
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user