mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 90.0.4430.0 (#857950)
- Linux ARM builds require use_vaapi=false (see https://crbug.com/1185348) - Windows official builds require use_thin_lto=false (see https://crbug.com/1177001)
This commit is contained in:
@@ -34,7 +34,7 @@ index 4e04a86c2d06..6d82d55acd15 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
|
||||
index 97cae92b96fa..6acf5188e1d6 100644
|
||||
index fa088bfa0019..7f00e2a2154f 100644
|
||||
--- chrome/browser/printing/print_preview_dialog_controller.cc
|
||||
+++ chrome/browser/printing/print_preview_dialog_controller.cc
|
||||
@@ -17,6 +17,7 @@
|
||||
@@ -45,7 +45,7 @@ index 97cae92b96fa..6acf5188e1d6 100644
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
|
||||
#include "chrome/browser/printing/print_view_manager.h"
|
||||
@@ -452,8 +453,11 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
|
||||
@@ -410,8 +411,11 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
|
||||
content::HostZoomMap::Get(preview_dialog->GetSiteInstance())
|
||||
->SetZoomLevelForHostAndScheme(print_url.scheme(), print_url.host(), 0);
|
||||
PrintViewManager::CreateForWebContents(preview_dialog);
|
||||
@@ -58,10 +58,10 @@ index 97cae92b96fa..6acf5188e1d6 100644
|
||||
// Add an entry to the map.
|
||||
preview_dialog_map_[preview_dialog] = initiator;
|
||||
diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
|
||||
index ae1ab34986d1..b742e9fffaf3 100644
|
||||
index 81df8a2cb0c3..ae4dcf5beb16 100644
|
||||
--- chrome/browser/printing/print_view_manager_base.cc
|
||||
+++ chrome/browser/printing/print_view_manager_base.cc
|
||||
@@ -22,6 +22,7 @@
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "base/timer/timer.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
@@ -69,7 +69,7 @@ index ae1ab34986d1..b742e9fffaf3 100644
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/chrome_notification_types.h"
|
||||
#include "chrome/browser/printing/print_job.h"
|
||||
@@ -61,6 +62,10 @@
|
||||
@@ -58,6 +59,10 @@
|
||||
#include "printing/printing_features.h"
|
||||
#endif
|
||||
|
||||
@@ -80,7 +80,7 @@ index ae1ab34986d1..b742e9fffaf3 100644
|
||||
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
||||
#include "chrome/browser/printing/print_error_dialog.h"
|
||||
#include "chrome/browser/printing/print_view_manager.h"
|
||||
@@ -201,8 +206,11 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
|
||||
@@ -198,8 +203,13 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
|
||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||
content::WebContents* web_contents =
|
||||
GetWebContentsForRenderFrame(render_process_id, render_frame_id);
|
||||
@@ -88,8 +88,10 @@ index ae1ab34986d1..b742e9fffaf3 100644
|
||||
- : nullptr;
|
||||
+ if (!web_contents)
|
||||
+ return nullptr;
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
+ if (cef::IsAlloyRuntimeEnabled())
|
||||
+ return CefPrintViewManager::FromWebContents(web_contents);
|
||||
+#endif
|
||||
+ return PrintViewManager::FromWebContents(web_contents);
|
||||
}
|
||||
|
||||
@@ -164,10 +166,10 @@ index 3d415a60d436..807ab41ee6ef 100644
|
||||
|
||||
ConstrainedWebDialogUI::~ConstrainedWebDialogUI() {
|
||||
diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
|
||||
index 181a4132f1be..4344ceaf83e5 100644
|
||||
index e64ac255c18f..ef40c08e3373 100644
|
||||
--- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
|
||||
+++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "base/values.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
@@ -175,7 +177,7 @@ index 181a4132f1be..4344ceaf83e5 100644
|
||||
#include "chrome/browser/app_mode/app_mode_utils.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/download/download_prefs.h"
|
||||
@@ -54,6 +55,10 @@
|
||||
@@ -55,6 +56,10 @@
|
||||
#include "chrome/browser/chromeos/drive/drive_integration_service.h"
|
||||
#endif
|
||||
|
||||
@@ -186,7 +188,7 @@ index 181a4132f1be..4344ceaf83e5 100644
|
||||
namespace printing {
|
||||
|
||||
namespace {
|
||||
@@ -377,10 +382,27 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
|
||||
@@ -378,10 +383,27 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
|
||||
// If the directory is empty there is no reason to create it or use the
|
||||
// default location.
|
||||
if (path.empty()) {
|
||||
@@ -214,7 +216,7 @@ index 181a4132f1be..4344ceaf83e5 100644
|
||||
// Get default download directory. This will be used as a fallback if the
|
||||
// save directory does not exist.
|
||||
DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(profile_);
|
||||
@@ -388,8 +410,7 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
|
||||
@@ -389,8 +411,7 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
|
||||
base::ThreadPool::PostTaskAndReplyWithResult(
|
||||
FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
|
||||
base::BindOnce(&SelectSaveDirectory, path, default_path),
|
||||
@@ -224,7 +226,7 @@ index 181a4132f1be..4344ceaf83e5 100644
|
||||
}
|
||||
|
||||
void PdfPrinterHandler::PostPrintToPdfTask() {
|
||||
@@ -430,6 +451,40 @@ void PdfPrinterHandler::OnDirectorySelected(const base::FilePath& filename,
|
||||
@@ -431,6 +452,40 @@ void PdfPrinterHandler::OnDirectorySelected(const base::FilePath& filename,
|
||||
platform_util::GetTopLevel(preview_web_contents_->GetNativeView()), NULL);
|
||||
}
|
||||
|
||||
@@ -294,7 +296,7 @@ index d796486f6b74..1a7b0d23128d 100644
|
||||
base::FilePath GetSaveLocation() const;
|
||||
|
||||
diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
||||
index 67aa6bc0d76e..0fecbd87423b 100644
|
||||
index 5beb6ac1f575..56e0fca6f317 100644
|
||||
--- chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
||||
+++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
||||
@@ -25,6 +25,7 @@
|
||||
@@ -302,10 +304,10 @@ index 67aa6bc0d76e..0fecbd87423b 100644
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
+#include "cef/libcef/features/features.h"
|
||||
#include "chrome/browser/account_manager_facade_factory.h"
|
||||
#include "chrome/browser/app_mode/app_mode_utils.h"
|
||||
#include "chrome/browser/bad_message.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
@@ -1080,7 +1081,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
|
||||
@@ -1081,7 +1082,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
|
||||
}
|
||||
return extension_printer_handler_.get();
|
||||
}
|
||||
@@ -314,7 +316,7 @@ index 67aa6bc0d76e..0fecbd87423b 100644
|
||||
if (printer_type == PrinterType::kPrivet &&
|
||||
GetPrefs()->GetBoolean(prefs::kForceEnablePrivetPrinting)) {
|
||||
if (!privet_printer_handler_) {
|
||||
@@ -1089,6 +1090,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
|
||||
@@ -1090,6 +1091,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
|
||||
}
|
||||
return privet_printer_handler_.get();
|
||||
}
|
||||
@@ -324,7 +326,7 @@ index 67aa6bc0d76e..0fecbd87423b 100644
|
||||
#endif
|
||||
if (printer_type == PrinterType::kPdf) {
|
||||
if (!pdf_printer_handler_) {
|
||||
@@ -1151,6 +1155,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
|
||||
@@ -1152,6 +1156,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
|
||||
}
|
||||
|
||||
void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
|
||||
@@ -332,7 +334,7 @@ index 67aa6bc0d76e..0fecbd87423b 100644
|
||||
DCHECK(!identity_manager_);
|
||||
cloud_print_enabled_ =
|
||||
!base::Contains(printer_type_deny_list_, PrinterType::kCloud) &&
|
||||
@@ -1167,6 +1172,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
|
||||
@@ -1168,6 +1173,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
|
||||
|
||||
identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
|
||||
identity_manager_->AddObserver(this);
|
||||
@@ -341,10 +343,10 @@ index 67aa6bc0d76e..0fecbd87423b 100644
|
||||
|
||||
void PrintPreviewHandler::UnregisterForGaiaCookieChanges() {
|
||||
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
||||
index fb3328d0d75b..4dd94d59e195 100644
|
||||
index 60b1fe2311c0..74ee97dbbf6d 100644
|
||||
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
||||
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
||||
@@ -29,6 +29,7 @@
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "base/values.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
@@ -352,7 +354,7 @@ index fb3328d0d75b..4dd94d59e195 100644
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/pdf/pdf_extension_util.h"
|
||||
#include "chrome/browser/printing/background_printing_manager.h"
|
||||
@@ -85,12 +86,16 @@ namespace printing {
|
||||
@@ -91,12 +92,16 @@ namespace printing {
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -367,5 +369,5 @@ index fb3328d0d75b..4dd94d59e195 100644
|
||||
#endif
|
||||
+#endif // !BUILDFLAG(ENABLE_CEF)
|
||||
|
||||
PrintPreviewUI::TestDelegate* g_test_delegate = nullptr;
|
||||
|
||||
constexpr char kInvalidArgsForDidStartPreview[] =
|
||||
"Invalid arguments for DidStartPreview";
|
||||
|
Reference in New Issue
Block a user