mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 73.0.3683.10
This commit is contained in:
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/73.0.3683.0'
|
'chromium_checkout': 'refs/tags/73.0.3683.10'
|
||||||
}
|
}
|
||||||
|
@@ -409,11 +409,5 @@ patches = [
|
|||||||
# macOS: Fix crash when showing a select popup with CefDoMessageLoopWork.
|
# macOS: Fix crash when showing a select popup with CefDoMessageLoopWork.
|
||||||
# https://bitbucket.org/chromiumembedded/cef/issues/2495
|
# https://bitbucket.org/chromiumembedded/cef/issues/2495
|
||||||
'name': 'message_pump_mac_2495',
|
'name': 'message_pump_mac_2495',
|
||||||
},
|
|
||||||
{
|
|
||||||
# Windows: Fix "error: unknown escape sequence" with jumbo builds.
|
|
||||||
# https://bugs.chromium.org/p/chromium/issues/detail?id=924454
|
|
||||||
'name': 'v8_embed_924454',
|
|
||||||
'path': 'v8',
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@@ -125,7 +125,7 @@ index 989d5d02cedb..e05810db6824 100644
|
|||||||
// If we broke out of the loop, we have found an enabled plugin.
|
// If we broke out of the loop, we have found an enabled plugin.
|
||||||
bool enabled = i < matching_plugins.size();
|
bool enabled = i < matching_plugins.size();
|
||||||
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
||||||
index 9136ab583964..1839ce97c7e4 100644
|
index 93512757d137..63105b158100 100644
|
||||||
--- chrome/renderer/chrome_content_renderer_client.cc
|
--- chrome/renderer/chrome_content_renderer_client.cc
|
||||||
+++ chrome/renderer/chrome_content_renderer_client.cc
|
+++ chrome/renderer/chrome_content_renderer_client.cc
|
||||||
@@ -781,6 +781,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
@@ -781,6 +781,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
|
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
|
||||||
index 2e32e5797683..89892c369d0b 100644
|
index 06008eab559d..73f419de5370 100644
|
||||||
--- chrome/renderer/BUILD.gn
|
--- chrome/renderer/BUILD.gn
|
||||||
+++ chrome/renderer/BUILD.gn
|
+++ chrome/renderer/BUILD.gn
|
||||||
@@ -4,6 +4,7 @@
|
@@ -4,6 +4,7 @@
|
||||||
|
@@ -68,10 +68,10 @@ index d44c7feaabec..5f1992335a38 100644
|
|||||||
|
|
||||||
void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
|
void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
|
||||||
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
|
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
|
||||||
index 8654e43cf38d..4176a60bbab3 100644
|
index 101b6f34dce7..1d750d40565d 100644
|
||||||
--- chrome/test/BUILD.gn
|
--- chrome/test/BUILD.gn
|
||||||
+++ chrome/test/BUILD.gn
|
+++ chrome/test/BUILD.gn
|
||||||
@@ -3962,7 +3962,7 @@ test("unit_tests") {
|
@@ -3965,7 +3965,7 @@ test("unit_tests") {
|
||||||
"../browser/ui/input_method/input_method_engine_unittest.cc",
|
"../browser/ui/input_method/input_method_engine_unittest.cc",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -80,7 +80,7 @@ index 8654e43cf38d..4176a60bbab3 100644
|
|||||||
sources +=
|
sources +=
|
||||||
[ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
|
[ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
|
||||||
deps += [ "//build/config/linux/gtk" ]
|
deps += [ "//build/config/linux/gtk" ]
|
||||||
@@ -3983,7 +3983,7 @@ test("unit_tests") {
|
@@ -3986,7 +3986,7 @@ test("unit_tests") {
|
||||||
if (use_gio) {
|
if (use_gio) {
|
||||||
configs += [ "//build/linux:gio_config" ]
|
configs += [ "//build/linux:gio_config" ]
|
||||||
}
|
}
|
||||||
@@ -89,7 +89,7 @@ index 8654e43cf38d..4176a60bbab3 100644
|
|||||||
deps += [ "//chrome/browser/ui/libgtkui" ]
|
deps += [ "//chrome/browser/ui/libgtkui" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4985,7 +4985,7 @@ if (!is_android) {
|
@@ -4988,7 +4988,7 @@ if (!is_android) {
|
||||||
# suites, it seems like one or another starts timing out too.
|
# suites, it seems like one or another starts timing out too.
|
||||||
"../browser/ui/views/keyboard_access_browsertest.cc",
|
"../browser/ui/views/keyboard_access_browsertest.cc",
|
||||||
]
|
]
|
||||||
|
@@ -1,25 +0,0 @@
|
|||||||
diff --git src/snapshot/embedded-file-writer.cc src/snapshot/embedded-file-writer.cc
|
|
||||||
index 9612fa6..6394287 100644
|
|
||||||
--- src/snapshot/embedded-file-writer.cc
|
|
||||||
+++ src/snapshot/embedded-file-writer.cc
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
|
|
||||||
#include "src/snapshot/embedded-file-writer.h"
|
|
||||||
|
|
||||||
+#include <algorithm>
|
|
||||||
#include <cinttypes>
|
|
||||||
|
|
||||||
#include "src/objects/code-inl.h"
|
|
||||||
@@ -613,7 +614,11 @@
|
|
||||||
|
|
||||||
void PlatformDependentEmbeddedFileWriter::DeclareExternalFilename(
|
|
||||||
int fileid, const char* filename) {
|
|
||||||
- fprintf(fp_, ".file %d \"%s\"\n", fileid, filename);
|
|
||||||
+ // Replace any Windows style paths (backslashes) with forward
|
|
||||||
+ // slashes.
|
|
||||||
+ std::string fixed_filename(filename);
|
|
||||||
+ std::replace(fixed_filename.begin(), fixed_filename.end(), '\\', '/');
|
|
||||||
+ fprintf(fp_, ".file %d \"%s\"\n", fileid, fixed_filename.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
void PlatformDependentEmbeddedFileWriter::FileEpilogue() {}
|
|
@@ -194,7 +194,7 @@ index 57fdabdb047a..db7c6b027452 100644
|
|||||||
// a reference.
|
// a reference.
|
||||||
corewm::TooltipWin* tooltip_;
|
corewm::TooltipWin* tooltip_;
|
||||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
|
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
|
||||||
index c2ea66ff7552..d90cd3538a40 100644
|
index bd2f435da5bb..2fdc664bd787 100644
|
||||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
|
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
|
||||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
|
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
|
||||||
@@ -145,6 +145,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
|
@@ -145,6 +145,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
|
||||||
@@ -232,7 +232,7 @@ index c2ea66ff7552..d90cd3538a40 100644
|
|||||||
xwindow_ = x11::None;
|
xwindow_ = x11::None;
|
||||||
|
|
||||||
desktop_native_widget_aura_->OnHostClosed();
|
desktop_native_widget_aura_->OnHostClosed();
|
||||||
@@ -644,6 +649,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
|
@@ -647,6 +652,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
|
gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
|
||||||
@@ -241,7 +241,7 @@ index c2ea66ff7552..d90cd3538a40 100644
|
|||||||
return ToDIPRect(bounds_in_pixels_);
|
return ToDIPRect(bounds_in_pixels_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1271,6 +1278,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels(
|
@@ -1273,6 +1280,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels(
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx::Point DesktopWindowTreeHostX11::GetLocationOnScreenInPixels() const {
|
gfx::Point DesktopWindowTreeHostX11::GetLocationOnScreenInPixels() const {
|
||||||
@@ -250,7 +250,7 @@ index c2ea66ff7552..d90cd3538a40 100644
|
|||||||
return bounds_in_pixels_.origin();
|
return bounds_in_pixels_.origin();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1411,7 +1420,6 @@ void DesktopWindowTreeHostX11::InitX11Window(
|
@@ -1413,7 +1422,6 @@ void DesktopWindowTreeHostX11::InitX11Window(
|
||||||
XAtom window_type;
|
XAtom window_type;
|
||||||
switch (params.type) {
|
switch (params.type) {
|
||||||
case Widget::InitParams::TYPE_MENU:
|
case Widget::InitParams::TYPE_MENU:
|
||||||
@@ -258,7 +258,7 @@ index c2ea66ff7552..d90cd3538a40 100644
|
|||||||
window_type = gfx::GetAtom("_NET_WM_WINDOW_TYPE_MENU");
|
window_type = gfx::GetAtom("_NET_WM_WINDOW_TYPE_MENU");
|
||||||
break;
|
break;
|
||||||
case Widget::InitParams::TYPE_TOOLTIP:
|
case Widget::InitParams::TYPE_TOOLTIP:
|
||||||
@@ -1467,9 +1475,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
|
@@ -1469,9 +1477,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
|
||||||
attribute_mask |= CWBorderPixel;
|
attribute_mask |= CWBorderPixel;
|
||||||
swa.border_pixel = 0;
|
swa.border_pixel = 0;
|
||||||
|
|
||||||
@@ -275,7 +275,7 @@ index c2ea66ff7552..d90cd3538a40 100644
|
|||||||
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
|
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
|
||||||
bounds_in_pixels_.height(),
|
bounds_in_pixels_.height(),
|
||||||
0, // border width
|
0, // border width
|
||||||
@@ -2090,6 +2104,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
|
@@ -2092,6 +2106,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@@ -1,14 +1,84 @@
|
|||||||
diff --git third_party/blink/public/mojom/plugins/plugin_registry.mojom third_party/blink/public/mojom/plugins/plugin_registry.mojom
|
diff --git third_party/blink/public/mojom/plugins/plugin_registry.mojom third_party/blink/public/mojom/plugins/plugin_registry.mojom
|
||||||
index 92e9cb865204..4628c56882b4 100644
|
index 92e9cb865204..e3d51ec6263e 100644
|
||||||
--- third_party/blink/public/mojom/plugins/plugin_registry.mojom
|
--- third_party/blink/public/mojom/plugins/plugin_registry.mojom
|
||||||
+++ third_party/blink/public/mojom/plugins/plugin_registry.mojom
|
+++ third_party/blink/public/mojom/plugins/plugin_registry.mojom
|
||||||
@@ -34,5 +34,5 @@ interface PluginRegistry {
|
@@ -1,38 +1,38 @@
|
||||||
//
|
-// Copyright 2018 The Chromium Authors. All rights reserved.
|
||||||
// TODO(crbug.com/850278): We shouldn't rely on the renderer to tell us the main frame origin.
|
-// Use of this source code is governed by a BSD-style license that can be
|
||||||
[Sync]
|
-// found in the LICENSE file.
|
||||||
|
-
|
||||||
|
-module blink.mojom;
|
||||||
|
-
|
||||||
|
-import "mojo/public/mojom/base/file_path.mojom";
|
||||||
|
-import "mojo/public/mojom/base/string16.mojom";
|
||||||
|
-import "url/mojom/origin.mojom";
|
||||||
|
-
|
||||||
|
-struct PluginMimeType {
|
||||||
|
- string mime_type;
|
||||||
|
- mojo_base.mojom.String16 description;
|
||||||
|
- array<string> file_extensions;
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-struct PluginInfo {
|
||||||
|
- mojo_base.mojom.String16 name;
|
||||||
|
- mojo_base.mojom.String16 description;
|
||||||
|
- mojo_base.mojom.FilePath filename;
|
||||||
|
- uint32 background_color;
|
||||||
|
- array<PluginMimeType> mime_types;
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-interface PluginRegistry {
|
||||||
|
- // Retrieves the list of plugins available to the renderer.
|
||||||
|
- //
|
||||||
|
- // If |refresh| is true, then cached information should not be used to
|
||||||
|
- // satisfy this call. |main_frame_origin| is used by the browser process to
|
||||||
|
- // filter plugins from the plugin list based on content settings.
|
||||||
|
- //
|
||||||
|
- // |main_frame_origin| is used to handle exceptions for plugin content
|
||||||
|
- // settings.
|
||||||
|
- //
|
||||||
|
- // TODO(crbug.com/850278): We shouldn't rely on the renderer to tell us the main frame origin.
|
||||||
|
- [Sync]
|
||||||
- GetPlugins(bool refresh, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins);
|
- GetPlugins(bool refresh, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins);
|
||||||
|
-};
|
||||||
|
+// Copyright 2018 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+module blink.mojom;
|
||||||
|
+
|
||||||
|
+import "mojo/public/mojom/base/file_path.mojom";
|
||||||
|
+import "mojo/public/mojom/base/string16.mojom";
|
||||||
|
+import "url/mojom/origin.mojom";
|
||||||
|
+
|
||||||
|
+struct PluginMimeType {
|
||||||
|
+ string mime_type;
|
||||||
|
+ mojo_base.mojom.String16 description;
|
||||||
|
+ array<string> file_extensions;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct PluginInfo {
|
||||||
|
+ mojo_base.mojom.String16 name;
|
||||||
|
+ mojo_base.mojom.String16 description;
|
||||||
|
+ mojo_base.mojom.FilePath filename;
|
||||||
|
+ uint32 background_color;
|
||||||
|
+ array<PluginMimeType> mime_types;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+interface PluginRegistry {
|
||||||
|
+ // Retrieves the list of plugins available to the renderer.
|
||||||
|
+ //
|
||||||
|
+ // If |refresh| is true, then cached information should not be used to
|
||||||
|
+ // satisfy this call. |main_frame_origin| is used by the browser process to
|
||||||
|
+ // filter plugins from the plugin list based on content settings.
|
||||||
|
+ //
|
||||||
|
+ // |main_frame_origin| is used to handle exceptions for plugin content
|
||||||
|
+ // settings.
|
||||||
|
+ //
|
||||||
|
+ // TODO(crbug.com/850278): We shouldn't rely on the renderer to tell us the main frame origin.
|
||||||
|
+ [Sync]
|
||||||
+ GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins);
|
+ GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins);
|
||||||
};
|
+};
|
||||||
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
|
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
|
||||||
index bfc4a95febcf..1d06dbbb09b0 100644
|
index bfc4a95febcf..1d06dbbb09b0 100644
|
||||||
--- third_party/blink/public/platform/platform.h
|
--- third_party/blink/public/platform/platform.h
|
||||||
|
Reference in New Issue
Block a user