bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux: Fix component build errors (fixes issue #3424)

This commit is contained in:
e.jorge 2023-01-12 16:49:21 +00:00 committed by Marshall Greenblatt
parent b1a530c76a
commit aae420aa8b
6 changed files with 109 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcef/browser/alloy/alloy_browser_main.cc
View File

@ -173,7 +173,7 @@ void AlloyBrowserMainParts::ToolkitInitialized() {
auto printing_delegate = new CefPrintingContextLinuxDelegate();
auto default_delegate =
printing::PrintingContextLinuxDelegate::SetInstance(printing_delegate);
ui::PrintingContextLinuxDelegate::SetInstance(printing_delegate);
printing_delegate->SetDefaultDelegate(default_delegate);
#endif // BUILDFLAG(IS_LINUX)

2
libcef/browser/printing/print_dialog_linux.cc
View File

@ -192,7 +192,7 @@ gfx::Size CefPrintingContextLinuxDelegate::GetPdfPaperSize(
}
void CefPrintingContextLinuxDelegate::SetDefaultDelegate(
printing::PrintingContextLinuxDelegate* delegate) {
ui::PrintingContextLinuxDelegate* delegate) {
DCHECK(!default_delegate_);
default_delegate_ = delegate;
}

8
libcef/browser/printing/print_dialog_linux.h
View File

@ -14,7 +14,7 @@
#include "base/task/sequenced_task_runner_helpers.h"
#include "content/public/browser/browser_thread.h"
#include "printing/print_dialog_linux_interface.h"
#include "printing/printing_context_linux.h"
#include "ui/linux/linux_ui.h"
namespace printing {
class MetafilePlayer;
@ -24,7 +24,7 @@ class PrintSettings;
using printing::PrintingContextLinux;
class CefPrintingContextLinuxDelegate
: public printing::PrintingContextLinuxDelegate {
: public ui::PrintingContextLinuxDelegate {
public:
CefPrintingContextLinuxDelegate();
@ -37,10 +37,10 @@ class CefPrintingContextLinuxDelegate
printing::PrintingContextLinux* context) override;
gfx::Size GetPdfPaperSize(printing::PrintingContextLinux* context) override;
void SetDefaultDelegate(printing::PrintingContextLinuxDelegate* delegate);
void SetDefaultDelegate(ui::PrintingContextLinuxDelegate* delegate);
private:
printing::PrintingContextLinuxDelegate* default_delegate_ = nullptr;
ui::PrintingContextLinuxDelegate* default_delegate_ = nullptr;
};
// Needs to be freed on the UI thread to clean up its member variables.

20
patch/patches/chrome_browser_browser.patch
View File

@ -13,7 +13,7 @@ index 2ffda8141468b..1800b34155201 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 932388c328889..68103c2a8ffcf 100644
index 932388c328889..f5b0894158537 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@ -43,6 +43,24 @@ index 932388c328889..68103c2a8ffcf 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2506,6 +2512,8 @@ static_library("ui") {
"views/apps/app_dialog/app_block_dialog_view.h",
"views/apps/app_dialog/app_pause_dialog_view.cc",
"views/apps/app_dialog/app_pause_dialog_view.h",
+ "views/apps/app_dialog/app_uninstall_dialog_view.cc",
+ "views/apps/app_dialog/app_uninstall_dialog_view.h",
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
"views/apps/chrome_app_window_client_views_chromeos.cc",
@@ -4242,8 +4250,6 @@ static_library("ui") {
"views/accessibility/theme_tracking_non_accessible_image_view.h",
"views/apps/app_dialog/app_dialog_view.cc",
"views/apps/app_dialog/app_dialog_view.h",
- "views/apps/app_dialog/app_uninstall_dialog_view.cc",
- "views/apps/app_dialog/app_uninstall_dialog_view.h",
"views/apps/app_info_dialog/app_info_dialog_container.cc",
"views/apps/app_info_dialog/app_info_dialog_container.h",
"views/apps/app_info_dialog/app_info_dialog_views.cc",
@@ -5727,6 +5733,7 @@ static_library("ui") {
if (enable_printing) {
deps += [

19
patch/patches/linux_bluetooth_1319006.patch
View File

@ -1,18 +1,21 @@
diff --git device/bluetooth/BUILD.gn device/bluetooth/BUILD.gn
index 0b526044dcc7c..91fbfcd112548 100644
index 0b526044dcc7c..349ffa6a6ceca 100644
--- device/bluetooth/BUILD.gn
+++ device/bluetooth/BUILD.gn
@@ -45,13 +45,6 @@ source_set("deprecated_experimental_mojo") {
"socket.h",
@@ -46,10 +46,12 @@ source_set("deprecated_experimental_mojo") {
]
- if (is_chromeos || is_linux) {
if (is_chromeos || is_linux) {
- sources += [
- "bluez/metrics_recorder.cc",
- "bluez/metrics_recorder.h",
- ]
- }
-
+ if (is_component_build) {
+ sources += [
+ "bluez/metrics_recorder.cc",
+ "bluez/metrics_recorder.h",
+ ]
+ }
}
deps = [
":bluetooth",
"//device/bluetooth/public/mojom:deprecated_experimental_interfaces",

186
patch/patches/linux_printing_context.patch
View File

@ -1,23 +1,57 @@
diff --git printing/printing_context_linux.cc printing/printing_context_linux.cc
index 5520e15c232c8..70742cba8056c 100644
index 83211e80d8270..753c07be0ec49 100644
--- printing/printing_context_linux.cc
+++ printing/printing_context_linux.cc
@@ -25,6 +25,12 @@
@@ -69,11 +69,11 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
ResetSettings();
namespace printing {
#if BUILDFLAG(IS_LINUX)
- if (!ui::LinuxUi::instance())
+ if (!ui::PrintingContextLinuxDelegate::instance())
return mojom::ResultCode::kSuccess;
+namespace {
+
if (!print_dialog_)
- print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
+ print_dialog_ = ui::PrintingContextLinuxDelegate::instance()->CreatePrintDialog(this);
print_dialog_->UseDefaultSettings();
#endif
@@ -82,8 +82,8 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
#if BUILDFLAG(IS_LINUX)
- if (ui::LinuxUi::instance())
- return ui::LinuxUi::instance()->GetPdfPaperSize(this);
+ if (ui::PrintingContextLinuxDelegate::instance())
+ return ui::PrintingContextLinuxDelegate::instance()->GetPdfPaperSize(this);
#endif
return gfx::Size();
@@ -95,11 +95,11 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterSettings(
DCHECK(!in_print_job_);
#if BUILDFLAG(IS_LINUX)
- if (!ui::LinuxUi::instance())
+ if (!ui::PrintingContextLinuxDelegate::instance())
return mojom::ResultCode::kSuccess;
if (!print_dialog_)
- print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
+ print_dialog_ = ui::PrintingContextLinuxDelegate::instance()->CreatePrintDialog(this);
// PrintDialogGtk::UpdateSettings() calls InitWithSettings() so settings_ will
// remain non-null after this line.
diff --git ui/linux/linux_ui.cc ui/linux/linux_ui.cc
index 29db798e8b171..f8b9546b90321 100644
--- ui/linux/linux_ui.cc
+++ ui/linux/linux_ui.cc
@@ -18,11 +18,29 @@ namespace ui {
namespace {
LinuxUi* g_linux_ui = nullptr;
+static PrintingContextLinuxDelegate* g_delegate = nullptr;
+
+} // namespace
+
// static
std::unique_ptr<PrintingContext> PrintingContext::CreateImpl(
Delegate* delegate,
@@ -47,6 +53,14 @@ PrintingContextLinux::~PrintingContextLinux() {
print_dialog_.ExtractAsDangling()->ReleaseDialog();
}
} // namespace
+// static
+PrintingContextLinuxDelegate* PrintingContextLinuxDelegate::SetInstance(
@ -27,112 +61,22 @@ index 5520e15c232c8..70742cba8056c 100644
+ return old_delegate;
+}
+
void PrintingContextLinux::AskUserForSettings(int max_pages,
bool has_selection,
bool is_scripted,
@@ -68,23 +82,19 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
ResetSettings();
-#if BUILDFLAG(IS_LINUX)
- if (!ui::LinuxUi::instance())
+ if (!g_delegate)
return mojom::ResultCode::kSuccess;
if (!print_dialog_)
- print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
+ print_dialog_ = g_delegate->CreatePrintDialog(this);
print_dialog_->UseDefaultSettings();
-#endif
return mojom::ResultCode::kSuccess;
}
gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
-#if BUILDFLAG(IS_LINUX)
- if (ui::LinuxUi::instance())
- return ui::LinuxUi::instance()->GetPdfPaperSize(this);
-#endif
+ if (g_delegate)
+ return g_delegate->GetPdfPaperSize(this);
return gfx::Size();
}
@@ -94,18 +104,16 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterSettings(
DCHECK(!printer_settings.show_system_dialog);
DCHECK(!in_print_job_);
-#if BUILDFLAG(IS_LINUX)
- if (!ui::LinuxUi::instance())
+ if (!g_delegate)
return mojom::ResultCode::kSuccess;
if (!print_dialog_)
- print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
+ print_dialog_ = g_delegate->CreatePrintDialog(this);
// PrintDialogGtk::UpdateSettings() calls InitWithSettings() so settings_ will
// remain non-null after this line.
print_dialog_->UpdateSettings(std::move(settings_));
DCHECK(settings_);
-#endif
return mojom::ResultCode::kSuccess;
}
diff --git printing/printing_context_linux.h printing/printing_context_linux.h
index 6fb35248ec459..3be9c29c7ebf9 100644
--- printing/printing_context_linux.h
+++ printing/printing_context_linux.h
@@ -16,6 +16,20 @@ namespace printing {
class MetafilePlayer;
class PrintDialogLinuxInterface;
+class PrintingContextLinux;
+// static
+PrintingContextLinuxDelegate* PrintingContextLinuxDelegate::instance() {
+ return g_delegate;
+}
+
+class COMPONENT_EXPORT(PRINTING) PrintingContextLinuxDelegate {
+ public:
+ virtual ~PrintingContextLinuxDelegate() = default;
+
+ virtual PrintDialogLinuxInterface* CreatePrintDialog(
+ PrintingContextLinux* context) = 0;
+
+ virtual gfx::Size GetPdfPaperSize(PrintingContextLinux* context) = 0;
+
+ static PrintingContextLinuxDelegate* SetInstance(
+ PrintingContextLinuxDelegate* delegate);
+};
// PrintingContext with optional native UI for print dialog and pdf_paper_size.
class COMPONENT_EXPORT(PRINTING) PrintingContextLinux : public PrintingContext {
diff --git tools/v8_context_snapshot/BUILD.gn tools/v8_context_snapshot/BUILD.gn
index eed0eed705d7f..482037423bc01 100644
--- tools/v8_context_snapshot/BUILD.gn
+++ tools/v8_context_snapshot/BUILD.gn
@@ -105,6 +105,7 @@ if (use_v8_context_snapshot) {
deps = [
"//gin:gin",
"//mojo/core/embedder",
+ "//printing",
"//services/service_manager/public/cpp",
"//third_party/blink/public:blink",
"//v8",
diff --git ui/linux/linux_ui.cc ui/linux/linux_ui.cc
index 29db798e8b171..a541ef1bef264 100644
--- ui/linux/linux_ui.cc
+++ ui/linux/linux_ui.cc
@@ -23,6 +23,10 @@ LinuxUi* g_linux_ui = nullptr;
// static
LinuxUi* LinuxUi::SetInstance(LinuxUi* instance) {
+#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_PRINTING)
+ printing::PrintingContextLinuxDelegate::SetInstance(instance);
+ PrintingContextLinuxDelegate::SetInstance(instance);
+#endif
+
return std::exchange(g_linux_ui, instance);
}
diff --git ui/linux/linux_ui.h ui/linux/linux_ui.h
index b5fd57741d2f4..9ebbd444ec3ac 100644
index b5fd57741d2f4..eaab5f1bd2b0b 100644
--- ui/linux/linux_ui.h
+++ ui/linux/linux_ui.h
@@ -18,6 +18,10 @@
@ -146,20 +90,36 @@ index b5fd57741d2f4..9ebbd444ec3ac 100644
// The main entrypoint into Linux toolkit specific code. GTK/QT code should only
// be executed behind this interface.
@@ -62,7 +66,11 @@ class WindowFrameProvider;
@@ -60,9 +64,27 @@ class TextEditCommandAuraLinux;
class WindowButtonOrderObserver;
class WindowFrameProvider;
+class COMPONENT_EXPORT(LINUX_UI) PrintingContextLinuxDelegate {
+ public:
+ virtual ~PrintingContextLinuxDelegate() = default;
+
+ virtual printing::PrintDialogLinuxInterface* CreatePrintDialog(
+ printing::PrintingContextLinux* context) = 0;
+
+ virtual gfx::Size GetPdfPaperSize(printing::PrintingContextLinux* context) = 0;
+
+ static PrintingContextLinuxDelegate* SetInstance(
+ PrintingContextLinuxDelegate* delegate);
+ static PrintingContextLinuxDelegate* instance();
+};
+
// 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 {
+class COMPONENT_EXPORT(LINUX_UI) LinuxUi
+#if BUILDFLAG(ENABLE_PRINTING)
+ : public printing::PrintingContextLinuxDelegate
+ : public PrintingContextLinuxDelegate
+#endif
+ {
public:
// Describes the window management actions that could be taken in response to
// a middle click in the non client area.
@@ -129,14 +137,6 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi {
@@ -129,14 +151,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;