commit 7429e33b521c614fc6587f8805c7bed83f99b18c
author Tom Sepez <tsepez@chromium.org> Fri Jan 18 19:41:05 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Jan 18 19:41:05 2019 +0000
tree c701d72b6b3e5ebd328fe0d6595b1a7905d3541b
parent e404b2965e7ec79df332ce42ad886602a1f21c55

Tidy xfa/fxgraphics/cxfa_graphics.h

- Class with no subclasses doesn't need protected members.
- Split struct declaration from corresponding member declaration.

Change-Id: I7d3ec1bba651991728429857ccc3922f4fb305e5
Reviewed-on: https://pdfium-review.googlesource.com/c/48510
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

xfa/fxgraphics/cxfa_graphics.h

diff --git a/xfa/fxgraphics/cxfa_graphics.h b/xfa/fxgraphics/cxfa_graphics.h
index 3eb6f42..37da034 100644
--- a/xfa/fxgraphics/cxfa_graphics.h
+++ b/xfa/fxgraphics/cxfa_graphics.h
@@ -55,9 +55,6 @@
                 const CFX_Matrix* matrix);
   void ConcatMatrix(const CFX_Matrix* matrix);
 
- protected:
-  int32_t m_type;
-
  private:
   struct TInfo {
     TInfo();
@@ -69,24 +66,24 @@
     bool isActOnDash;
     CXFA_GEColor strokeColor;
     CXFA_GEColor fillColor;
-  } m_info;
+  };
 
   void RenderDeviceStrokePath(const CXFA_GEPath* path,
                               const CFX_Matrix* matrix);
   void RenderDeviceFillPath(const CXFA_GEPath* path,
                             FX_FillMode fillMode,
                             const CFX_Matrix* matrix);
-
   void FillPathWithPattern(const CXFA_GEPath* path,
                            FX_FillMode fillMode,
                            const CFX_Matrix& matrix);
   void FillPathWithShading(const CXFA_GEPath* path,
                            FX_FillMode fillMode,
                            const CFX_Matrix& matrix);
-
   void SetDIBitsWithMatrix(const RetainPtr<CFX_DIBBase>& source,
                            const CFX_Matrix& matrix);
 
+  int32_t m_type;
+  TInfo m_info;
   CFX_RenderDevice* const m_renderDevice;  // Not owned.
   std::vector<std::unique_ptr<TInfo>> m_infoStack;
 };