From 211e87bcdf7c04895bd6055442a9530dc4d0be8e Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Wed, 19 Sep 2018 17:27:35 +0000
Subject: Initialize CPDF_ImageRenderer in the header.

Also add a GetRenderOptions() helper method.

Change-Id: I47db7a21f55f396e08775575f6b2a48e440c2f91
Reviewed-on: https://pdfium-review.googlesource.com/42750
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
---
 core/fpdfapi/render/cpdf_imagerenderer.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'core/fpdfapi/render/cpdf_imagerenderer.h')

diff --git a/core/fpdfapi/render/cpdf_imagerenderer.h b/core/fpdfapi/render/cpdf_imagerenderer.h
index c6ccb0c86d..c538d9f5f2 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.h
+++ b/core/fpdfapi/render/cpdf_imagerenderer.h
@@ -21,6 +21,7 @@ class CFX_ImageTransformer;
 class CPDF_ImageObject;
 class CPDF_PageObject;
 class CPDF_Pattern;
+class CPDF_RenderOptions;
 class CPDF_RenderStatus;
 
 class CPDF_ImageRenderer {
@@ -61,25 +62,26 @@ class CPDF_ImageRenderer {
                           const RetainPtr<CFX_DIBBase>& pDIBBase,
                           CFX_Matrix* pNewMatrix,
                           const FX_RECT& rect) const;
+  const CPDF_RenderOptions& GetRenderOptions() const;
   void HandleFilters();
 
   UnownedPtr<CPDF_RenderStatus> m_pRenderStatus;
   UnownedPtr<CPDF_ImageObject> m_pImageObject;
-  int m_Status;
   UnownedPtr<const CFX_Matrix> m_pObj2Device;
+  UnownedPtr<CPDF_Pattern> m_pPattern;
+  RetainPtr<CFX_DIBBase> m_pDIBBase;
   CFX_Matrix m_ImageMatrix;
   CPDF_ImageLoader m_Loader;
-  RetainPtr<CFX_DIBBase> m_pDIBBase;
-  int m_BitmapAlpha;
-  bool m_bPatternColor;
-  UnownedPtr<CPDF_Pattern> m_pPattern;
-  FX_ARGB m_FillArgb;
-  uint32_t m_Flags;
   std::unique_ptr<CFX_ImageTransformer> m_pTransformer;
   std::unique_ptr<CFX_ImageRenderer> m_DeviceHandle;
-  bool m_bStdCS;
-  int m_BlendType;
-  bool m_Result;
+  int m_Status = 0;
+  int m_BitmapAlpha = 0;
+  int m_BlendType = FXDIB_BLEND_NORMAL;
+  FX_ARGB m_FillArgb = 0;
+  uint32_t m_Flags = 0;
+  bool m_bPatternColor = false;
+  bool m_bStdCS = false;
+  bool m_Result = true;
 };
 
 #endif  // CORE_FPDFAPI_RENDER_CPDF_IMAGERENDERER_H_
-- 
cgit v1.2.3