Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 213165a467
Branches Tags
electron
/
patches
/
chromium
/
fix_crash_when_saving_edited_pdf_files.patch

fix_crash_when_saving_edited_pdf_files.patch 2.3 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Mon, 17 Jan 2022 23:47:54 +0100
    4. 

  4. Subject: fix: crash when saving edited PDF files
    5. 

  5. 

  6. Originally, this patch contained a code change. Since then, the code has
    7. 

  7. been upstreamed[1] but placed behind a flag. This patch now enables the
    8. 

  8. flag by default, therefore using the code fix from the original patch.
    9. 

  9. 

  10. This flag will eventually be removed and the original code fix will be
    11. 

  11. all that is left behind. When that happens, this patch will be safe to
    12. 

  12. remove.
    13. 

  13. 

  14. [1]: https://chromium-review.googlesource.com/c/chromium/src/+/6205762
    15. 

  15. 

  16. Original patch description:
    17. 

  17. 

  18. > This commit fixes a crash that persists any time a user attempts to
    19. 

  19. > download an edited PDF. This was happening because the logic flow for
    20. 

  20. > downloading of any edited PDF triggers a call to
    21. 

  21. > chrome.fileSystem.chooseEntry, which we do not support and which
    22. 

  22. > therefore causes unmapped page access crashes.
    23. 

  23. >
    24. 

  24. > This patch can be removed should we choose to support chrome.fileSystem
    25. 

  25. > or support it enough to fix the crash.
    26. 

  26. 

  27. diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
    28. 

  28. index 0bab3a5c852357bb6dc7758e573093a080e06b79..594d168331eba048b4bc5d25ad6f6834e2e88360 100644
    29. 

  29. --- a/chrome/browser/resources/pdf/pdf_viewer.ts
    30. 

  30. +++ b/chrome/browser/resources/pdf/pdf_viewer.ts
    31. 

  31. @@ -269,7 +269,7 @@ export class PdfViewerElement extends PdfViewerBaseElement {
    32. 

  32.    // <if expr="enable_pdf_ink2">
    33. 

  33.    protected pdfInk2Enabled_: boolean = false;
    34. 

  34.    // </if>
    35. 

  35. -  private pdfUseShowSaveFilePicker_: boolean = false;
    36. 

  36. +  private pdfUseShowSaveFilePicker_: boolean = true;
    37. 

  37.    private pluginController_: PluginController = PluginController.getInstance();
    38. 

  38.    protected printingEnabled_: boolean = false;
    39. 

  39.    // <if expr="enable_pdf_ink2">
    40. 

  40. diff --git a/pdf/pdf_features.cc b/pdf/pdf_features.cc
    41. 

  41. index 387174b3ee8aa39f0e3c4c67274e8c6b738c889f..a8ee6d48009de8fb10eff8689a694ac2e60a3723 100644
    42. 

  42. --- a/pdf/pdf_features.cc
    43. 

  43. +++ b/pdf/pdf_features.cc
    44. 

  44. @@ -55,7 +55,7 @@ BASE_FEATURE(kPdfTags, "PdfTags", base::FEATURE_DISABLED_BY_DEFAULT);
    45. 

  45.  
    46. 

  46.  BASE_FEATURE(kPdfUseShowSaveFilePicker,
    47. 

  47.               "PdfUseShowSaveFilePicker",
    48. 

  48. -             base::FEATURE_DISABLED_BY_DEFAULT);
    49. 

  49. +             base::FEATURE_ENABLED_BY_DEFAULT);
    50. 

  50.  
    51. 

  51.  BASE_FEATURE(kPdfUseSkiaRenderer,
    52. 

  52.               "PdfUseSkiaRenderer",
    53.