Rename async to linearized when parsing

core/fpdfapi/fpdf_parser/cpdf_document.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_parser/include/cpdf_document.h"
 
 #include <memory>
 #include <set>
@@ skipping 478 matching lines @@
       m_iFirstPageNo(0),
       m_dwFirstPageObjNum(0),
       m_pDocPage(new CPDF_DocPageData(this)),
       m_pDocRender(new CPDF_DocRenderData(this)) {}
 
 CPDF_Document::~CPDF_Document() {
   delete m_pDocPage;
   CPDF_ModuleMgr::Get()->GetPageModule()->ClearStockFont(this);
 }
 
-void CPDF_Document::LoadDoc() {
+void CPDF_Document::LoadDocInternal() {
   m_LastObjNum = m_pParser->GetLastObjNum();
+
   CPDF_Object* pRootObj = GetIndirectObject(m_pParser->GetRootObjNum());
-  if (!pRootObj) {
+  if (!pRootObj)
     return;
-  }
+
   m_pRootDict = pRootObj->GetDict();
-  if (!m_pRootDict) {
+  if (!m_pRootDict)
     return;
-  }
+
   CPDF_Object* pInfoObj = GetIndirectObject(m_pParser->GetInfoObjNum());
-  if (pInfoObj) {
+  if (pInfoObj)
     m_pInfoDict = pInfoObj->GetDict();
-  }
-  CPDF_Array* pIDArray = m_pParser->GetIDArray();
-  if (pIDArray) {
+  if (CPDF_Array* pIDArray = m_pParser->GetIDArray()) {
     m_ID1 = pIDArray->GetStringAt(0);
     m_ID2 = pIDArray->GetStringAt(1);
   }
+}
+
+void CPDF_Document::LoadDoc() {
+  LoadDocInternal();
+

[Tom Sepez, 2016/08/16 18:08:01]

nit: blank line not needed here.

[dsinclair, 2016/08/16 18:28:18]

Done.

   m_PageList.SetSize(RetrievePageCount());
 }
 
-void CPDF_Document::LoadAsynDoc(CPDF_Dictionary* pLinearized) {
+void CPDF_Document::LoadLinearizedDoc(CPDF_Dictionary* pLinearized) {
   m_bLinearized = true;
-  m_LastObjNum = m_pParser->GetLastObjNum();
-  CPDF_Object* pIndirectObj = GetIndirectObject(m_pParser->GetRootObjNum());
-  m_pRootDict = pIndirectObj ? pIndirectObj->GetDict() : nullptr;
-  if (!m_pRootDict) {
-    return;
-  }
-  pIndirectObj = GetIndirectObject(m_pParser->GetInfoObjNum());
-  m_pInfoDict = pIndirectObj ? pIndirectObj->GetDict() : nullptr;
-  CPDF_Array* pIDArray = m_pParser->GetIDArray();
-  if (pIDArray) {
-    m_ID1 = pIDArray->GetStringAt(0);
-    m_ID2 = pIDArray->GetStringAt(1);
-  }
+

[Tom Sepez, 2016/08/16 18:08:01]

nit: blank line not needed here (but the one at 529)

[dsinclair, 2016/08/16 18:28:18]

Done.

+  LoadDocInternal();
+
   uint32_t dwPageCount = 0;
   CPDF_Object* pCount = pLinearized->GetObjectBy("N");
   if (ToNumber(pCount))
     dwPageCount = pCount->GetInteger();
+  m_PageList.SetSize(dwPageCount);
 
-  m_PageList.SetSize(dwPageCount);
   CPDF_Object* pNo = pLinearized->GetObjectBy("P");
   if (ToNumber(pNo))
     m_iFirstPageNo = pNo->GetInteger();
 
   CPDF_Object* pObjNum = pLinearized->GetObjectBy("O");
   if (ToNumber(pObjNum))
     m_dwFirstPageObjNum = pObjNum->GetInteger();
 }
 
 void CPDF_Document::LoadPages() {
@@ skipping 897 matching lines @@
     }
   }
   pFontDesc->SetAtInteger("StemV", fStemV);
   AddIndirectObject(pFontDesc);
   pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
   CFRelease(traits);
   CFRelease(languages);
   return LoadFont(pBaseDict);
 }
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_