commit 91eeeb92b38dba91270b0a13f14b3c4f7f1e030a
author Daniel Hosseinian <dhoss@chromium.org> Wed Jan 27 19:53:24 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jan 27 19:53:24 2021 +0000
tree e8168bf585c8ef4cb2af55af85d04f99381c0b05
parent 7b819bf6d97431ddcdce15b5cf50f88b9c066e9b

Remove nonstroking color space operator from generated clipping paths

The color space operator adds a black rectangle.

Fixed: pdfium:1574
Change-Id: I0fbb098f6c21263897c7d203fabfc499203a7a2c
Bug: pdfium:1574
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/77631
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: Hui Yingst <nigi@chromium.org>

core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp

diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index e0e1291..d182d89 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -448,7 +448,7 @@
 
       // Use a no-op path-painting operator to terminate the path without
       // causing any marks to be placed on the page.
-      *buf << "n 0 g ";
+      *buf << "n ";
     }
   }
 

core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp

diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
index 5e145b2..96014b5 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
@@ -354,7 +354,7 @@
   ByteString lastString =
       textString.Last(textString.GetLength() - firstResourceAt.value());
   // q and Q must be outside the BT .. ET operations
-  ByteString compareString1 = "q 0 0 5 4 re W* n 0 g BT 1 0 0 1 0 0 Tm /";
+  ByteString compareString1 = "q 0 0 5 4 re W* n BT 1 0 0 1 0 0 Tm /";
   ByteString compareString2 =
       " 15.5 Tf 4 Tr <4920616D20696E646972656374> Tj ET Q\n";
   EXPECT_LT(compareString1.GetLength() + compareString2.GetLength(),

fpdfsdk/fpdf_edit_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index e00784f..099bc00 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -849,13 +849,9 @@
   FPDF_PAGE saved_page = LoadSavedPage(0);
   ASSERT_TRUE(saved_page);
 
-  // TODO(crbug.com/pdfium/1578): The regenerated text object should not be
-  // covered by a black rectangle. The expected bitmap should still be
-  // |kOriginalChecksum|.
-  static constexpr char kChangedChecksum[] = "bb3606ecbe252f867bc51d65f9d56503";
   {
     ScopedFPDFBitmap saved_bitmap = RenderSavedPage(saved_page);
-    CompareBitmap(saved_bitmap.get(), 200, 300, kChangedChecksum);
+    CompareBitmap(saved_bitmap.get(), 200, 300, kOriginalChecksum);
   }
 
   CloseSavedPage(saved_page);