Remove PageObject's m_Type and add As<Type> functions

core/src/fpdfapi/fpdf_page/fpdf_page.cpp

 // 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
 
 #include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 #include <algorithm>
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "third_party/base/stl_util.h"
 
-CPDF_PageObject* CPDF_PageObject::Create(int type) {
+CPDF_PageObject* CPDF_PageObject::Create(Type type) {
   switch (type) {
     case TEXT:
       return new CPDF_TextObject;
     case IMAGE:
       return new CPDF_ImageObject;
     case PATH:
       return new CPDF_PathObject;
     case SHADING:
       return new CPDF_ShadingObject;
     case FORM:
       return new CPDF_FormObject;
   }
   return NULL;
 }
 CPDF_PageObject::~CPDF_PageObject() {}
 CPDF_PageObject* CPDF_PageObject::Clone() const {
-  CPDF_PageObject* pObj = Create(m_Type);
+  CPDF_PageObject* pObj = Create(GetType());
   pObj->Copy(this);
   return pObj;
 }
 void CPDF_PageObject::Copy(const CPDF_PageObject* pSrc) {
-  if (m_Type != pSrc->m_Type) {
+  if (GetType() != pSrc->GetType()) {
     return;
   }
   CopyData(pSrc);
   CopyStates(*pSrc);
   m_Left = pSrc->m_Left;
   m_Right = pSrc->m_Right;
   m_Top = pSrc->m_Top;
   m_Bottom = pSrc->m_Bottom;
 }
 void CPDF_PageObject::AppendClipPath(CPDF_Path path,
                                      int type,
                                      FX_BOOL bAutoMerge) {
   m_ClipPath.AppendPath(path, type, bAutoMerge);
 }
 void CPDF_PageObject::CopyClipPath(CPDF_PageObject* pObj) {
   m_ClipPath = pObj->m_ClipPath;
 }
 void CPDF_PageObject::RemoveClipPath() {
   m_ClipPath.SetNull();
 }
 void CPDF_PageObject::RecalcBBox() {
-  switch (m_Type) {
+  switch (GetType()) {
     case TEXT:
       ((CPDF_TextObject*)this)->RecalcPositionData();
       break;
     case PATH:
       ((CPDF_PathObject*)this)->CalcBoundingBox();
       break;
     case SHADING:
       ((CPDF_ShadingObject*)this)->CalcBoundingBox();
       break;
     default:
@@ skipping 16 matching lines @@
 }
 FX_RECT CPDF_PageObject::GetBBox(const CFX_Matrix* pMatrix) const {
   CFX_FloatRect rect(m_Left, m_Bottom, m_Right, m_Top);
   if (pMatrix) {
     pMatrix->TransformRect(rect);
   }
   return rect.GetOutterRect();
 }
 
 CPDF_TextObject::CPDF_TextObject()
-    : CPDF_PageObject(TEXT),
-      m_PosX(0),
+    : m_PosX(0),
       m_PosY(0),
       m_nChars(0),
       m_pCharCodes(nullptr),
       m_pCharPos(nullptr) {}
 
 CPDF_TextObject::~CPDF_TextObject() {
   if (m_nChars > 1) {
     FX_Free(m_pCharCodes);
   }
   FX_Free(m_pCharPos);
@@ skipping 496 matching lines @@
     FXSYS_memcpy(m_pCharPos, pCharPos, sizeof(FX_FLOAT) * (nChars - 1));
   }
   RecalcPositionData();
 }
 
 void CPDF_TextObject::SetTextState(CPDF_TextState TextState) {
   m_TextState = TextState;
   CalcPositionData(nullptr, nullptr, 0);
 }
 
-CPDF_ShadingObject::CPDF_ShadingObject()
-    : CPDF_PageObject(SHADING), m_pShading(nullptr) {}
+CPDF_ShadingObject::CPDF_ShadingObject() : m_pShading(nullptr) {}
 
 CPDF_ShadingObject::~CPDF_ShadingObject() {}
 
 void CPDF_ShadingObject::CopyData(const CPDF_PageObject* pSrc) {
   CPDF_ShadingObject* pSrcObj = (CPDF_ShadingObject*)pSrc;
   m_pShading = pSrcObj->m_pShading;
   if (m_pShading && m_pShading->m_pDocument) {
     CPDF_DocPageData* pDocPageData = m_pShading->m_pDocument->GetPageData();
     m_pShading = (CPDF_ShadingPattern*)pDocPageData->GetPattern(
         m_pShading->m_pShadingObj, m_pShading->m_bShadingObj,
@@ skipping 341 matching lines @@
                      (FX_FLOAT)y0);
   matrix = m_PageMatrix;
   matrix.Concat(display_matrix);
 }
 CPDF_ParseOptions::CPDF_ParseOptions() {
   m_bTextOnly = FALSE;
   m_bMarkedContent = TRUE;
   m_bSeparateForm = TRUE;
   m_bDecodeInlineImage = FALSE;
 }