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 --- fpdfsdk/formfiller/cffl_formfiller.cpp | 5 ++--- fpdfsdk/fpdf_view.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 261cb653e5..4438df0b25 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -489,9 +489,8 @@ CFX_FloatRect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) { return CFX_FloatRect(); CFX_FloatRect rcFocus = FFLtoWnd(pPageView, PWLtoFFL(pWnd->GetFocusRect())); - return pPageView->GetPDFPage()->GetPageBBox().Contains(rcFocus) - ? rcFocus - : CFX_FloatRect(); + return pPageView->GetPDFPage()->GetBBox().Contains(rcFocus) ? rcFocus + : CFX_FloatRect(); } CFX_FloatRect CFFL_FormFiller::FFLtoPWL(const CFX_FloatRect& rect) { diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp index 1b33952204..96de5d56e1 100644 --- a/fpdfsdk/fpdf_view.cpp +++ b/fpdfsdk/fpdf_view.cpp @@ -385,7 +385,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDF_GetPageBoundingBox(FPDF_PAGE page, if (!pPage) return false; - FSRECTFFromCFXFloatRect(pPage->GetPageBBox(), rect); + FSRECTFFromCFXFloatRect(pPage->GetBBox(), rect); return true; } -- cgit v1.2.3