Clean up CPDF_Page.

core/fpdfapi/fpdf_page/fpdf_page_doc.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/fpdfapi/fpdf_page/pageint.h"
 
 #include "core/fdrm/crypto/include/fx_crypt.h"
 #include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
@@ skipping 132 matching lines @@
 }
 
 void CPDF_DocPageData::Clear(FX_BOOL bForceRelease) {
   m_bForceClear = bForceRelease;
 
   for (auto& it : m_PatternMap) {
     CPDF_CountedPattern* ptData = it.second;
     if (!ptData->get())
       continue;
 
-    if (bForceRelease || ptData->use_count() < 2) {
-      ptData->get()->SetForceClear(bForceRelease);
+    if (bForceRelease || ptData->use_count() < 2)
       ptData->clear();
-    }
   }
 
   for (auto& it : m_FontMap) {
     CPDF_CountedFont* fontData = it.second;
     if (!fontData->get())
       continue;
 
     if (bForceRelease || fontData->use_count() < 2) {
       fontData->clear();
     }
@@ skipping 262 matching lines @@
     }
   }
   CPDF_Pattern* pPattern = nullptr;
   if (bShading) {
     pPattern =
         new CPDF_ShadingPattern(m_pPDFDoc, pPatternObj, bShading, matrix);
   } else {
     CPDF_Dictionary* pDict = pPatternObj ? pPatternObj->GetDict() : nullptr;
     if (pDict) {
       int type = pDict->GetIntegerBy("PatternType");
-      if (type == 1) {
+      if (type == CPDF_Pattern::TILING) {
         pPattern = new CPDF_TilingPattern(m_pPDFDoc, pPatternObj, matrix);
-      } else if (type == 2) {
+      } else if (type == CPDF_Pattern::SHADING) {
         pPattern =
             new CPDF_ShadingPattern(m_pPDFDoc, pPatternObj, FALSE, matrix);
       }
     }
   }
   if (!pPattern)
     return nullptr;
 
   if (!ptData) {
     ptData = new CPDF_CountedPattern(pPattern);
@@ skipping 158 matching lines @@
 }
 
 CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr(
     CPDF_Object* pPatternObj) const {
   if (!pPatternObj)
     return nullptr;
 
   auto it = m_PatternMap.find(pPatternObj);
   return it != m_PatternMap.end() ? it->second : nullptr;
 }