mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-23 07:27:42 +01:00
Update to Chromium version 94.0.4606.41
This commit is contained in:
parent
5c40d9fcee
commit
9059374bf6
@ -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.31',
|
'chromium_checkout': 'refs/tags/94.0.4606.41',
|
||||||
'depot_tools_checkout': '64a9f33bdd'
|
'depot_tools_checkout': '64a9f33bdd'
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
|
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
|
||||||
index 2e0bcdd47dea..79cc0943c5dc 100644
|
index 956208be7742..ad0af4bd622c 100644
|
||||||
--- chrome/browser/download/download_target_determiner.cc
|
--- chrome/browser/download/download_target_determiner.cc
|
||||||
+++ chrome/browser/download/download_target_determiner.cc
|
+++ chrome/browser/download/download_target_determiner.cc
|
||||||
@@ -678,7 +678,7 @@ void IsHandledBySafePlugin(int render_process_id,
|
@@ -681,7 +681,7 @@ void IsHandledBySafePlugin(int render_process_id,
|
||||||
content::PluginService* plugin_service =
|
content::PluginService* plugin_service =
|
||||||
content::PluginService::GetInstance();
|
content::PluginService::GetInstance();
|
||||||
bool plugin_found = plugin_service->GetPluginInfo(
|
bool plugin_found = plugin_service->GetPluginInfo(
|
||||||
@ -188,10 +188,10 @@ index 632ae86c6fd6..55b749ec1242 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 9bf31d2cb714..d3f72ef80fb5 100644
|
index a0cfdfbe0551..e6230526ab32 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
|
||||||
@@ -12028,6 +12028,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
@@ -12074,6 +12074,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
|
||||||
}
|
}
|
||||||
|
|
||||||
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
||||||
@ -199,7 +199,7 @@ index 9bf31d2cb714..d3f72ef80fb5 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) {
|
||||||
@@ -12035,7 +12036,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
|
@@ -12081,7 +12082,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(
|
||||||
|
@ -130,10 +130,10 @@ index 7a8ceb191643..01d0ca9a1931 100644
|
|||||||
// Set the view's active state (i.e., tint state of controls).
|
// Set the view's active state (i.e., tint state of controls).
|
||||||
virtual void SetActive(bool active) = 0;
|
virtual void SetActive(bool active) = 0;
|
||||||
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
|
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
|
||||||
index 9d0bc6966680..152c6f01059b 100644
|
index b8389ec9f2f6..a17ebd8e0707 100644
|
||||||
--- ui/platform_window/x11/x11_window.cc
|
--- ui/platform_window/x11/x11_window.cc
|
||||||
+++ ui/platform_window/x11/x11_window.cc
|
+++ ui/platform_window/x11/x11_window.cc
|
||||||
@@ -1671,7 +1671,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
|
@@ -1679,7 +1679,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
|
||||||
req.border_pixel = 0;
|
req.border_pixel = 0;
|
||||||
|
|
||||||
bounds_in_pixels_ = SanitizeBounds(bounds);
|
bounds_in_pixels_ = SanitizeBounds(bounds);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||||
index 9a68af9b6d5b..442c69b30589 100644
|
index 26e2700ba846..2ac038dbf19c 100644
|
||||||
--- chrome/app/generated_resources.grd
|
--- chrome/app/generated_resources.grd
|
||||||
+++ chrome/app/generated_resources.grd
|
+++ chrome/app/generated_resources.grd
|
||||||
@@ -5306,7 +5306,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
@@ -5306,7 +5306,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||||
|
Loading…
x
Reference in New Issue
Block a user