Make some CPDF_StreamContentParser methods static.

For methods that are only exposed for testing. Once they are static,
there is no need for dummy CPDF_StreamContentParser constructor calls in
the unit tests. Adjust the CPDF_StreamContentParser constructor now that
one of the parameters can no longer be a nullptr.

Change-Id: If29b02ea216002a7bb325b1913281f58b70382aa
Reviewed-on: https://pdfium-review.googlesource.com/12230
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

1 files changed, 7 insertions, 5 deletions

diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.h b/core/fpdfapi/page/cpdf_streamcontentparser.h
index 41385558d3..5cbe0ce734 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.h
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.h
@@ -37,7 +37,7 @@ class CPDF_StreamContentParser {
                            const CFX_Matrix* pmtContentToUser,
                            CPDF_PageObjectHolder* pObjectHolder,
                            CPDF_Dictionary* pResources,
-                           CFX_FloatRect* pBBox,
+                           const CFX_FloatRect& rcBBox,
                            CPDF_AllStates* pAllStates,
                            int level);
   ~CPDF_StreamContentParser();
@@ -51,8 +51,10 @@ class CPDF_StreamContentParser {
   const float* GetType3Data() const { return m_Type3Data; }
   CPDF_Font* FindFont(const CFX_ByteString& name);
 
-  CFX_ByteStringC FindKeyAbbreviationForTesting(const CFX_ByteStringC& abbr);
-  CFX_ByteStringC FindValueAbbreviationForTesting(const CFX_ByteStringC& abbr);
+  static CFX_ByteStringC FindKeyAbbreviationForTesting(
+      const CFX_ByteStringC& abbr);
+  static CFX_ByteStringC FindValueAbbreviationForTesting(
+      const CFX_ByteStringC& abbr);
 
  private:
   struct ContentParam {
@@ -196,9 +198,9 @@ class CPDF_StreamContentParser {
   CFX_UnownedPtr<CPDF_Dictionary> m_pParentResources;
   CFX_UnownedPtr<CPDF_Dictionary> m_pResources;
   CFX_UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder;
-  int m_Level;
+  const int m_Level;
   CFX_Matrix m_mtContentToUser;
-  CFX_FloatRect m_BBox;
+  const CFX_FloatRect m_BBox;
   ContentParam m_ParamBuf[kParamBufSize];
   uint32_t m_ParamStartPos;
   uint32_t m_ParamCount;