From 778e59ed40ed31f6176a68253b694acd31f640c9 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 5 Jun 2018 19:24:42 +0000 Subject: Tidy parser lifecycle state machine in CPDF_PageObjectHolder. Only update state in CPDF_PageObjectHolder itself. Make more data private. Remove CPDF_Page::GetPageBBox() as exact duplicate of CPDF_PageObjectHolder::GetBBox(). Change-Id: I083ec33f61a1490e7a5e673c9787751af15a6cd1 Reviewed-on: https://pdfium-review.googlesource.com/33810 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 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..5d9e029267 100644 --- a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp +++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp @@ -299,7 +299,8 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessEmptyForm) { auto pTestForm = pdfium::MakeUnique(pDoc.get(), nullptr, pStream.get()); pTestForm->ParseContent(nullptr, nullptr, nullptr, nullptr); - ASSERT_TRUE(pTestForm->IsParsed()); + ASSERT_EQ(CPDF_PageObjectHolder::ParseState::kParsed, + pTestForm->GetParseState()); // The generated stream for the empty form should be an empty string. CPDF_PageContentGenerator generator(pTestForm.get()); @@ -325,7 +326,8 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessFormWithPath) { auto pTestForm = pdfium::MakeUnique(pDoc.get(), nullptr, pStream.get()); pTestForm->ParseContent(nullptr, nullptr, nullptr, nullptr); - ASSERT_TRUE(pTestForm->IsParsed()); + ASSERT_EQ(CPDF_PageObjectHolder::ParseState::kParsed, + pTestForm->GetParseState()); CPDF_PageContentGenerator generator(pTestForm.get()); std::ostringstream process_buf; -- cgit v1.2.3