Rename CPDFXFA_Document::GetPageCount

core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp

 // Copyright 2016 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_data_avail.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 1405 matching lines @@
       m_docStatus = PDF_DATAAVAIL_DONE;
       return TRUE;
     }
   }
   return TRUE;
 }
 
 FX_BOOL CPDF_DataAvail::LoadDocPage(uint32_t dwPage, DownloadHints* pHints) {
   FX_SAFE_INT32 safePage = pdfium::base::checked_cast<int32_t>(dwPage);
   int32_t iPage = safePage.ValueOrDie();
+  // TODO(dsinclair): This won't work correctly for XFA as the pageList in
+  // the document does not contain XFA pages.

[npm, 2016/09/21 21:59:22]

I think I don't understand. You are not changing the way this part
works, since m_pDocument is a CPDF_Document. Is this for when you
change the CXFA_Document to be a subclass of CPDF_Document?

[dsinclair, 2016/09/22 14:06:02]

The problem I see here is that, the page count for an XFA document != page count
for the PDF document. So, if we're loading an XFA document with 5 pages, and two
of those pages are XFA pages, this method will never return _DONE for those last
two pages, I think. The TODO is to make sure this will work correctly with XFA
in general.

   if (m_pDocument->GetPageCount() <= iPage ||
       m_pDocument->IsPageLoaded(iPage)) {
     m_docStatus = PDF_DATAAVAIL_DONE;
     return TRUE;
   }
 
   if (m_pageNodes.m_type == PDF_PAGENODE_PAGE) {
     if (iPage == 0) {
       m_docStatus = PDF_DATAAVAIL_DONE;
       return TRUE;
@@ skipping 321 matching lines @@
   if (pSize)
     *pSize = (uint32_t)(m_dwFileLen - m_dwLastXRefOffset);
 }
 
 int CPDF_DataAvail::GetPageCount() const {
   if (m_pLinearized) {
     CPDF_Dictionary* pDict = m_pLinearized->GetDict();
     CPDF_Object* pObj = pDict ? pDict->GetDirectObjectFor("N") : nullptr;
     return pObj ? pObj->GetInteger() : 0;
   }
+  // TODO(dsinclair): This will be wrong for XFA documents.
   return m_pDocument ? m_pDocument->GetPageCount() : 0;
 }
 
 CPDF_Dictionary* CPDF_DataAvail::GetPage(int index) {
   if (!m_pDocument || index < 0 || index >= GetPageCount())
     return nullptr;
 
   if (m_pLinearized) {
     CPDF_Dictionary* pDict = m_pLinearized->GetDict();
     CPDF_Object* pObj = pDict ? pDict->GetDirectObjectFor("P") : nullptr;
@@ skipping 58 matching lines @@
   return FormAvailable;
 }
 
 CPDF_DataAvail::PageNode::PageNode() : m_type(PDF_PAGENODE_UNKNOWN) {}
 
 CPDF_DataAvail::PageNode::~PageNode() {
   for (int32_t i = 0; i < m_childNode.GetSize(); ++i)
     delete m_childNode[i];
   m_childNode.RemoveAll();
 }