summaryrefslogtreecommitdiff
path: root/core/fpdfapi/page/cpdf_page.h
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-02-09 22:08:41 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-02-09 22:08:41 +0000
commitbc5dd9e7901ee56e0db66e76bf2e4903ab3d3fcd (patch)
tree0c62ff1e2e3695dbd98b8472d4846f792d1d87b4 /core/fpdfapi/page/cpdf_page.h
parent2404eba504ac36ce2bfd2f7d6092f9e3898de9b0 (diff)
downloadpdfium-bc5dd9e7901ee56e0db66e76bf2e4903ab3d3fcd.tar.xz
Use CFX_Size in CPDF_Page and fpdf_ppo.cpp.
Instead of having separate floats for width and height. Also remove some out parameters and just return them instead. Change-Id: I798b1453910c89477d422dcb7c0805b90823bf98 Reviewed-on: https://pdfium-review.googlesource.com/26090 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Shirleen Lou <xlou@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_page.h')
-rw-r--r--core/fpdfapi/page/cpdf_page.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h
index e1b5bcfa44..c7aa12e474 100644
--- a/core/fpdfapi/page/cpdf_page.h
+++ b/core/fpdfapi/page/cpdf_page.h
@@ -28,7 +28,7 @@ class CPDF_Page : public CPDF_PageObjectHolder {
bool bPageCache);
~CPDF_Page() override;
- // CPDF_PageObjectHolder
+ // CPDF_PageObjectHolder:
bool IsPage() const override;
void ParseContent();
@@ -39,9 +39,11 @@ class CPDF_Page : public CPDF_PageObjectHolder {
int ySize,
int iRotate) const;
- float GetPageWidth() const { return m_PageWidth; }
- float GetPageHeight() const { return m_PageHeight; }
- CFX_FloatRect GetPageBBox() const { return m_BBox; }
+ float GetPageWidth() const { return m_PageSize.width; }
+ float GetPageHeight() const { return m_PageSize.height; }
+ const CFX_SizeF& GetPageSize() const { return m_PageSize; }
+
+ const CFX_FloatRect& GetPageBBox() const { return m_BBox; }
int GetPageRotation() const;
CPDF_PageRenderCache* GetRenderCache() const { return m_pPageRender.get(); }
@@ -59,10 +61,9 @@ class CPDF_Page : public CPDF_PageObjectHolder {
CPDF_Object* GetPageAttr(const ByteString& name) const;
CFX_FloatRect GetBox(const ByteString& name) const;
- float m_PageWidth;
- float m_PageHeight;
+ CFX_SizeF m_PageSize;
CFX_Matrix m_PageMatrix;
- View* m_pView;
+ View* m_pView = nullptr;
std::unique_ptr<CPDF_PageRenderCache> m_pPageRender;
std::unique_ptr<CPDF_PageRenderContext> m_pRenderContext;
};