bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 106.0.5249.0 (#1036826)

Browse Source
This commit is contained in:
Marshall Greenblatt
2022-08-22 21:37:40 -04:00
parent 6d71f5ffd7
commit 7659dd60ba
84 changed files with 694 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
patch/patches/linux_printing_context.patch
View File

@ -117,26 +117,27 @@ index a06eae4ab3217..43851307c531f 100644
"//third_party/blink/public:blink",
"//v8",
diff --git ui/linux/linux_ui.cc ui/linux/linux_ui.cc
index bae51eec69a8d..8675048b9117f 100644
index ec285b1637e57..1f9a4556c4a03 100644
--- ui/linux/linux_ui.cc
+++ ui/linux/linux_ui.cc
@@ -29,6 +29,9 @@ namespace ui {
@@ -28,6 +28,10 @@ namespace ui {
// static
std::unique_ptr<LinuxUi> LinuxUi::SetInstance(
std::unique_ptr<LinuxUi> instance) {
gfx::AnimationSettingsProviderLinux::SetInstance(instance.get());
+#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_PRINTING)
+ printing::PrintingContextLinuxDelegate::SetInstance(instance.get());
+#endif
+
return std::exchange(GetLinuxUiInstance(), std::move(instance));
}
diff --git ui/linux/linux_ui.h ui/linux/linux_ui.h
index e8be3f2e60182..8c7bddd4a3d2d 100644
index dee97740309e2..1e034b5e2e9ec 100644
--- ui/linux/linux_ui.h
+++ ui/linux/linux_ui.h
@@ -20,6 +20,10 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/animation/animation_settings_provider_linux.h"
@@ -18,6 +18,10 @@
#include "build/chromecast_buildflags.h"
#include "printing/buildflags/buildflags.h"
+#if BUILDFLAG(ENABLE_PRINTING)
+#include "printing/printing_context_linux.h" // nogncheck
@ -145,20 +146,20 @@ index e8be3f2e60182..8c7bddd4a3d2d 100644
// The main entrypoint into Linux toolkit specific code. GTK/QT code should only
// be executed behind this interface.
@@ -60,7 +64,11 @@ class WindowFrameProvider;
@@ -59,7 +63,11 @@ class WindowFrameProvider;
// Adapter class with targets to render like different toolkits. Set by any
// project that wants to do linux desktop native rendering.
class COMPONENT_EXPORT(LINUX_UI) LinuxUi
- : public gfx::AnimationSettingsProviderLinux {
+ : public gfx::AnimationSettingsProviderLinux
-class COMPONENT_EXPORT(LINUX_UI) LinuxUi {
+class COMPONENT_EXPORT(LINUX_UI) LinuxUi
+#if BUILDFLAG(ENABLE_PRINTING)
+ , public printing::PrintingContextLinuxDelegate
+ : public printing::PrintingContextLinuxDelegate
+#endif
+{
+ {
public:
using UseSystemThemeCallback =
base::RepeatingCallback<bool(aura::Window* window)>;
@@ -181,14 +189,6 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi
@@ -180,14 +188,6 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi {
// Returns a map of KeyboardEvent code to KeyboardEvent key values.
virtual base::flat_map<std::string, std::string> GetKeyboardLayoutMap() = 0;