From 5044cab9c228ecd39e0ba07f0f5cced0a1cf6dd4 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 10:09:33 -0800 Subject: Merge to XFA: Use unique_ptr and initializer lists in various render files. TBR=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1436573003 . (cherry picked from commit c813e21d261c24867234107f2e2ca72e15cb2534) Review URL: https://codereview.chromium.org/1406933007 . --- core/include/fpdfapi/fpdf_pageobj.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'core/include') diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h index 7ea51cc814..a3695f7e7b 100644 --- a/core/include/fpdfapi/fpdf_pageobj.h +++ b/core/include/fpdfapi/fpdf_pageobj.h @@ -10,25 +10,27 @@ #include "../fxge/fx_ge.h" #include "fpdf_resource.h" -class CPDF_Path; -class CPDF_ClipPathData; class CPDF_ClipPath; -class CPDF_ColorStateData; +class CPDF_ClipPathData; class CPDF_ColorState; -class CPDF_GraphState; -class CPDF_TextStateData; -class CPDF_TextState; -class CPDF_GeneralStateData; -class CPDF_GeneralState; -class CPDF_ContentMarkItem; +class CPDF_ColorStateData; class CPDF_ContentMark; +class CPDF_ContentMarkItem; +class CPDF_FormObject; +class CPDF_GeneralState; +class CPDF_GeneralStateData; class CPDF_GraphicStates; +class CPDF_GraphState; +class CPDF_ImageObject; class CPDF_PageObject; -class CPDF_TextObject; +class CPDF_Path; class CPDF_PathObject; -class CPDF_ImageObject; class CPDF_ShadingObject; -class CPDF_FormObject; +class CPDF_TextObject; +class CPDF_TextState; +class CPDF_TextStateData; +class CPDF_TransferFunc; + typedef CFX_PathData CPDF_PathData; class CPDF_Path : public CFX_CountRef { @@ -196,7 +198,7 @@ class CPDF_TextState : public CFX_CountRef { FX_FLOAT GetShearAngle() const; }; -class CPDF_TransferFunc; + class CPDF_GeneralStateData { public: CPDF_GeneralStateData(); -- cgit v1.2.3