Tidy up shading patterns

core/include/fpdfapi/fpdf_resource.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 
 #include <map>
@@ skipping 618 matching lines @@
 
   FX_FLOAT* GetPatternColor() const;
 
   CPDF_ColorSpace* m_pCS;
 
  protected:
   void ReleaseBuffer();
   void ReleaseColorSpace();
   FX_FLOAT* m_pBuffer;
 };
-#define PATTERN_TILING 1
-#define PATTERN_SHADING 2
+
 class CPDF_Pattern {
  public:
+  enum PatternType { TILING = 1, SHADING };
+
   virtual ~CPDF_Pattern();
+
   void SetForceClear(FX_BOOL bForceClear) { m_bForceClear = bForceClear; }
 
-  CPDF_Object* m_pPatternObj;
-
-  int m_PatternType;
-
+  const PatternType m_PatternType;
+  CPDF_Document* const m_pDocument;
+  CPDF_Object* const m_pPatternObj;
   CFX_Matrix m_Pattern2Form;
   CFX_Matrix m_ParentMatrix;
 
-  CPDF_Document* m_pDocument;
+ protected:
+  CPDF_Pattern(PatternType type,
+               CPDF_Document* pDoc,
+               CPDF_Object* pObj,
+               const CFX_Matrix* pParentMatrix);
 
- protected:
-  CPDF_Pattern(const CFX_Matrix* pParentMatrix);
   FX_BOOL m_bForceClear;
 };
 
 class CPDF_TilingPattern : public CPDF_Pattern {
  public:
   CPDF_TilingPattern(CPDF_Document* pDoc,
                      CPDF_Object* pPatternObj,
                      const CFX_Matrix* parentMatrix);
 
   ~CPDF_TilingPattern() override;
@@ skipping 31 matching lines @@
                       const CFX_Matrix* parentMatrix);
 
   ~CPDF_ShadingPattern() override;
 
   bool IsMeshShading() const {
     return m_ShadingType == kFreeFormGouraudTriangleMeshShading ||
            m_ShadingType == kLatticeFormGouraudTriangleMeshShading ||
            m_ShadingType == kCoonsPatchMeshShading ||
            m_ShadingType == kTensorProductPatchMeshShading;
   }
+  FX_BOOL Load();
 
+  ShadingType m_ShadingType;
+  FX_BOOL m_bShadingObj;
   CPDF_Object* m_pShadingObj;
 
-  FX_BOOL m_bShadingObj;
-
-  FX_BOOL Load();
-
-  FX_BOOL Reload();
-
-  ShadingType m_ShadingType;
-
-  CPDF_ColorSpace* m_pCS;  // Still keep m_pCS as some CPDF_ColorSpace (name
-                           // object) are not managed as counted objects. Refer
-                           // to CPDF_DocPageData::GetColorSpace.
+  // Still keep m_pCS as some CPDF_ColorSpace (name object) are not managed as

[Lei Zhang, 2016/01/09 01:03:56]

|m_pCS|

+  // counted objects. Refer to CPDF_DocPageData::GetColorSpace.
+  CPDF_ColorSpace* m_pCS;
 
   CPDF_CountedColorSpace* m_pCountedCS;
+  CPDF_Function* m_pFunctions[4];
+  int m_nFuncs;
+};
 
-  CPDF_Function* m_pFunctions[4];
-
-  int m_nFuncs;
-
- protected:
-  void Clear();
-};
 struct CPDF_MeshVertex {
   FX_FLOAT x, y;
   FX_FLOAT r, g, b;
 };
 class CPDF_MeshStream {
  public:
   FX_BOOL Load(CPDF_Stream* pShadingStream,
                CPDF_Function** pFuncs,
                int nFuncs,
                CPDF_ColorSpace* pCS);
@@ skipping 110 matching lines @@
 
   FX_BOOL m_bInterpolate;
 
   CPDF_Document* m_pDocument;
 
   CPDF_Dictionary* m_pOC;
   CPDF_Dictionary* InitJPEG(uint8_t* pData, FX_DWORD size);
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_