mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
fa39ee4bb7
* chore: bump chromium in DEPS to 108.0.5359.4 * chore: update patches * fixup! Change content::PluginList to only run on the UI thread. (cherry picked from commit7b5ec87d4f) Co-Authored-By: Robo <hop2deep@gmail.com> (cherry picked from commit76a618e7d0) * chore: bump chromium in DEPS to 108.0.5359.10 * chore: update patches * fixup printing patch https://github.com/electron/electron/pull/35375 accidentally broke https://github.com/electron/electron/pull/34711 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
87 lines
3.4 KiB
Diff
87 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 17 Jan 2022 23:47:54 +0100
|
|
Subject: fix: crash when saving edited PDF files
|
|
|
|
This commit fixes a crash that persists any time a user attempts to
|
|
download an edited PDF. This was happening because the logic flow for
|
|
downloading of any edited PDF triggers a call to
|
|
chrome.fileSystem.chooseEntry, which we do not support and which
|
|
therefore causes unmapped page access crashes.
|
|
|
|
This patch can be removed should we choose to support chrome.fileSystem
|
|
or support it enough to fix the crash.
|
|
|
|
diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
|
|
index 05bb506868ffc2b72e57b348f10e868258297447..990336cc320135b27361494735a08a2284f95136 100644
|
|
--- a/chrome/browser/resources/pdf/pdf_viewer.ts
|
|
+++ b/chrome/browser/resources/pdf/pdf_viewer.ts
|
|
@@ -865,26 +865,12 @@ export class PdfViewerElement extends PdfViewerBaseElement {
|
|
dataArray = [result.dataToSave];
|
|
}
|
|
|
|
+ const a = document.createElement('a');
|
|
+ a.download = this.attachments_[index].name;
|
|
const blob = new Blob(dataArray);
|
|
- const fileName = this.attachments_[index].name;
|
|
- chrome.fileSystem.chooseEntry(
|
|
- {type: 'saveFile', suggestedName: fileName},
|
|
- (entry?: FileSystemFileEntry) => {
|
|
- if (chrome.runtime.lastError) {
|
|
- if (chrome.runtime.lastError.message !== 'User cancelled') {
|
|
- console.error(
|
|
- 'chrome.fileSystem.chooseEntry failed: ' +
|
|
- chrome.runtime.lastError.message);
|
|
- }
|
|
- return;
|
|
- }
|
|
- entry!.createWriter((writer: FileWriter) => {
|
|
- writer.write(blob);
|
|
- // Unblock closing the window now that the user has saved
|
|
- // successfully.
|
|
- chrome.mimeHandlerPrivate.setShowBeforeUnloadDialog(false);
|
|
- });
|
|
- });
|
|
+ a.href = URL.createObjectURL(blob);
|
|
+ a.click();
|
|
+ URL.revokeObjectURL(a.href);
|
|
}
|
|
|
|
/**
|
|
@@ -992,30 +978,12 @@ export class PdfViewerElement extends PdfViewerBaseElement {
|
|
fileName = fileName + '.pdf';
|
|
}
|
|
|
|
- // Create blob before callback to avoid race condition.
|
|
+ const a = document.createElement('a');
|
|
+ a.download = fileName;
|
|
const blob = new Blob([result.dataToSave], {type: 'application/pdf'});
|
|
- chrome.fileSystem.chooseEntry(
|
|
- {
|
|
- type: 'saveFile',
|
|
- accepts: [{description: '*.pdf', extensions: ['pdf']}],
|
|
- suggestedName: fileName,
|
|
- },
|
|
- (entry?: FileSystemFileEntry) => {
|
|
- if (chrome.runtime.lastError) {
|
|
- if (chrome.runtime.lastError.message !== 'User cancelled') {
|
|
- console.error(
|
|
- 'chrome.fileSystem.chooseEntry failed: ' +
|
|
- chrome.runtime.lastError.message);
|
|
- }
|
|
- return;
|
|
- }
|
|
- entry!.createWriter((writer: FileWriter) => {
|
|
- writer.write(blob);
|
|
- // Unblock closing the window now that the user has saved
|
|
- // successfully.
|
|
- chrome.mimeHandlerPrivate.setShowBeforeUnloadDialog(false);
|
|
- });
|
|
- });
|
|
+ a.href = URL.createObjectURL(blob);
|
|
+ a.click();
|
|
+ URL.revokeObjectURL(a.href);
|
|
|
|
// <if expr="enable_ink">
|
|
// Saving in Annotation mode is destructive: crbug.com/919364
|