From d3d8287e143daf12a602a919c120b4e0c656abf8 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Tue, 5 Jun 2018 16:19:11 +0000 Subject: Create m_ContentStream field in CPDF_PageObject. Content streams are now split and can set nonzero values to identify each parsed content stream. Bug: pdfium:1051 Change-Id: Ia2cb1e0997db5264d468043af31f9b41e8d0d349 Reviewed-on: https://pdfium-review.googlesource.com/33591 Commit-Queue: Henrique Nakashima Reviewed-by: Ryan Harrison --- core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core/fpdfapi/edit') diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp index 1244b12331..f1dbffeccf 100644 --- a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp +++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp @@ -49,7 +49,7 @@ class CPDF_PageContentGeneratorTest : public testing::Test { }; TEST_F(CPDF_PageContentGeneratorTest, ProcessRect) { - auto pPathObj = pdfium::MakeUnique(); + auto pPathObj = pdfium::MakeUnique(-1); pPathObj->m_Path.AppendRect(10, 5, 13, 30); pPathObj->m_FillType = FXFILL_ALTERNATE; pPathObj->m_bStroke = true; @@ -60,7 +60,7 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessRect) { TestProcessPath(&generator, &buf, pPathObj.get()); EXPECT_EQ("q 1 0 0 1 0 0 cm 10 5 3 25 re B* Q\n", ByteString(buf)); - pPathObj = pdfium::MakeUnique(); + pPathObj = pdfium::MakeUnique(-1); pPathObj->m_Path.AppendPoint(CFX_PointF(0, 0), FXPT_TYPE::MoveTo, false); pPathObj->m_Path.AppendPoint(CFX_PointF(5.2f, 0), FXPT_TYPE::LineTo, false); pPathObj->m_Path.AppendPoint(CFX_PointF(5.2f, 3.78f), FXPT_TYPE::LineTo, @@ -75,7 +75,7 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessRect) { } TEST_F(CPDF_PageContentGeneratorTest, ProcessPath) { - auto pPathObj = pdfium::MakeUnique(); + auto pPathObj = pdfium::MakeUnique(-1); pPathObj->m_Path.AppendPoint(CFX_PointF(3.102f, 4.67f), FXPT_TYPE::MoveTo, false); pPathObj->m_Path.AppendPoint(CFX_PointF(5.45f, 0.29f), FXPT_TYPE::LineTo, @@ -110,7 +110,7 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessPath) { } TEST_F(CPDF_PageContentGeneratorTest, ProcessGraphics) { - auto pPathObj = pdfium::MakeUnique(); + auto pPathObj = pdfium::MakeUnique(-1); pPathObj->m_Path.AppendPoint(CFX_PointF(1, 2), FXPT_TYPE::MoveTo, false); pPathObj->m_Path.AppendPoint(CFX_PointF(3, 4), FXPT_TYPE::LineTo, false); pPathObj->m_Path.AppendPoint(CFX_PointF(5, 6), FXPT_TYPE::LineTo, true); @@ -170,7 +170,7 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessStandardText) { CPDF_Dictionary* pPageDict = pDoc->CreateNewPage(0); auto pTestPage = pdfium::MakeRetain(pDoc.get(), pPageDict, false); CPDF_PageContentGenerator generator(pTestPage.Get()); - auto pTextObj = pdfium::MakeUnique(); + auto pTextObj = pdfium::MakeUnique(-1); CPDF_Font* pFont = CPDF_Font::GetStockFont(pDoc.get(), "Times-Roman"); pTextObj->m_TextState.SetFont(pFont); pTextObj->m_TextState.SetFontSize(10.0f); @@ -237,7 +237,7 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessText) { std::ostringstream buf; { // Set the text object font and text - auto pTextObj = pdfium::MakeUnique(); + auto pTextObj = pdfium::MakeUnique(-1); CPDF_Dictionary* pDict = pDoc->NewIndirect(); pDict->SetNewFor("Type", "Font"); pDict->SetNewFor("Subtype", "TrueType"); -- cgit v1.2.3