Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / pdfium / core / include / fpdfapi / fpdf_resource.h

diff --git a/src/third_party/pdfium/core/include/fpdfapi/fpdf_resource.h b/src/third_party/pdfium/core/include/fpdfapi/fpdf_resource.h
index 49e7148..4ce4ddc 100644 (file)
--- a/src/third_party/pdfium/core/include/fpdfapi/fpdf_resource.h
+++ b/src/third_party/pdfium/core/include/fpdfapi/fpdf_resource.h
@@ -730,27 +730,25 @@ protected:
 class CPDF_Pattern : public CFX_Object
 {
 public:
+   
+    virtual ~CPDF_Pattern();
+    void SaveColor(CPDF_Color* pColor) {m_pColor = pColor;}
 
-    virtual ~CPDF_Pattern() {}
+    CPDF_Object*                m_pPatternObj;
 
-    CPDF_Object*                       m_pPatternObj;
+    int                         m_PatternType;
 
-    int                                                m_PatternType;
+    CFX_AffineMatrix            m_Pattern2Form;
+    CFX_AffineMatrix            m_ParentMatrix;
 
-    CFX_AffineMatrix           m_Pattern2Form;
-    CFX_AffineMatrix           m_ParentMatrix;
-
-    CPDF_Document*                     m_pDocument;
+    CPDF_Document*              m_pDocument;
+    CPDF_Color*                 m_pColor;
 
 protected:
-
-    CPDF_Pattern(const CFX_AffineMatrix* pParentMatrix)
-    {
-        if (pParentMatrix) {
-            m_ParentMatrix = *pParentMatrix;
-        }
-    }
+    
+    CPDF_Pattern(const CFX_AffineMatrix* pParentMatrix);
 };
+
 class CPDF_TilingPattern : public CPDF_Pattern
 {
 public:
@@ -882,7 +880,7 @@ public:
 
     CPDF_Dictionary*           GetDict() const
     {
-        return m_pStream->GetDict();
+        return m_pStream? m_pStream->GetDict(): NULL;
     }
 
     CPDF_Dictionary*           GetOC() const