Simplify PDFiumEngine::CheckPageAvailable().

pdf/pdfium/pdfium_engine.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "pdf/pdfium/pdfium_engine.h"
 
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 1149 matching lines @@
 }
 
 void PDFiumEngine::FinishLoadingDocument() {
   DCHECK(doc_loader_.IsDocumentComplete() && doc_);
 
   bool need_update = false;
   for (size_t i = 0; i < pages_.size(); ++i) {
     if (pages_[i]->available())
       continue;
 
-    pages_[i]->set_available(true);
+    pages_[i]->set_as_available();
     // We still need to call IsPageAvail() even if the whole document is
     // already downloaded.
-    FPDFAvail_IsPageAvail(fpdf_availability_, i, &download_hints_);
+    // Page should be available because the whole document is available.
+    int avail = FPDFAvail_IsPageAvail(fpdf_availability_, i, &download_hints_);
+    DCHECK_EQ(PDF_DATA_AVAIL, avail);
+
     need_update = true;
     if (IsPageVisible(i))
       client_->Invalidate(GetPageScreenRect(i));
   }
   if (need_update)
     LoadPageInfo(true);
 
   if (called_do_document_action_)
     return;
   called_do_document_action_ = true;
@@ skipping 1557 matching lines @@
 bool PDFiumEngine::IsPageVisible(int index) const {
   for (size_t i = 0; i < visible_pages_.size(); ++i) {
     if (visible_pages_[i] == index)
       return true;
   }
 
   return false;
 }
 
 bool PDFiumEngine::CheckPageAvailable(int index, std::vector<int>* pending) {
-  if (!doc_ || !form_)
+  if (!doc_ || !form_ || index < 0)
     return false;
 
-  if (static_cast<int>(pages_.size()) > index && pages_[index]->available())
+  const size_t index_size_t = static_cast<size_t>(index);
+  if (index_size_t < pages_.size() && pages_[index]->available())
     return true;
 
-  if (!FPDFAvail_IsPageAvail(fpdf_availability_, index, &download_hints_)) {
-    size_t j;
-    for (j = 0; j < pending->size(); ++j) {
-      if ((*pending)[j] == index)
-        break;
-    }
+  int avail =
+      FPDFAvail_IsPageAvail(fpdf_availability_, index, &download_hints_);
+  if (avail == PDF_DATA_ERROR)
+    return false;
 
-    if (j == pending->size())
+  if (avail == PDF_DATA_NOTAVAIL) {
+    if (!ContainsValue(*pending, index))
       pending->push_back(index);
     return false;
   }
 
-  if (static_cast<int>(pages_.size()) > index)
-    pages_[index]->set_available(true);
+  if (index_size_t < pages_.size())
+    pages_[index]->set_as_available();
   if (!default_page_size_.GetArea())
     default_page_size_ = GetPageSize(index);
   return true;
 }
 
 pp::Size PDFiumEngine::GetPageSize(int index) {
   pp::Size size;
   double width_in_points = 0;
   double height_in_points = 0;
   int rv = FPDF_GetPageSizeByIndex(
@@ skipping 1222 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf