Support linearized loading

testing/embedder_test.cpp

 // Copyright (c) 2015 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.
 
 #include "embedder_test.h"
 
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "../public/fpdf_dataavail.h"
+#include "../public/fpdf_macro.h"
 #include "../public/fpdf_text.h"
-#include "../public/fpdfview.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 #ifdef PDF_ENABLE_V8
 #include "v8/include/libplatform/libplatform.h"
 #include "v8/include/v8.h"
 #endif  // PDF_ENABLE_V8
 
 #ifdef _WIN32
 #define snprintf _snprintf
 #define PATH_SEPARATOR '\\'
@@ skipping 179 matching lines @@
   file_access_.m_GetBlock = Get_Block;
   file_access_.m_Param = loader_;
 
   file_avail_.version = 1;
   file_avail_.IsDataAvail = Is_Data_Avail;
 
   hints_.version = 1;
   hints_.AddSegment = Add_Segment;
 
   avail_ = FPDFAvail_Create(&file_avail_, &file_access_);
-  (void)FPDFAvail_IsDocAvail(avail_, &hints_);
-
-  if (!FPDFAvail_IsLinearized(avail_)) {
+  if (FPDFAvail_IsLinearized(avail_) != PDF_LINEARIZED) {
     document_ = FPDF_LoadCustomDocument(&file_access_, nullptr);
   } else {
     document_ = FPDFAvail_GetDocument(avail_, nullptr);
+    while (!FPDFAvail_IsDocAvail(avail_, &hints_))

[Tom Sepez, 2015/10/14 16:57:45]

do we need to make this same change in samples/pdfium_test.cc ?

[jun_fang, 2015/10/15 10:22:28]

Acknowledged.

+      continue;
+    if (FPDFAvail_IsFormAvail(avail_, &hints_) == PDF_FORM_NOTAVAIL) {
+      return false;
+    }
+    int page_count = FPDF_GetPageCount(document_);
+    for (int i = 0; i < page_count; ++i) {
+      while (!FPDFAvail_IsPageAvail(avail_, i, &hints_))
+        continue;
+    }
   }
-
+  if (!document_)
+    return false;
   (void)FPDF_GetDocPermissions(document_);
-  (void)FPDFAvail_IsFormAvail(avail_, &hints_);
 
   IPDF_JSPLATFORM* platform = static_cast<IPDF_JSPLATFORM*>(this);
   memset(platform, 0, sizeof(IPDF_JSPLATFORM));
   platform->version = 2;
   platform->app_alert = AlertTrampoline;
 
   FPDF_FORMFILLINFO* formfillinfo = static_cast<FPDF_FORMFILLINFO*>(this);
   memset(formfillinfo, 0, sizeof(FPDF_FORMFILLINFO));
   formfillinfo->version = 1;
   formfillinfo->FFI_SetTimer = SetTimerTrampoline;
@@ skipping 118 matching lines @@
 }
 
 // Can't use gtest-provided main since we need to stash the path to the
 // executable in order to find the external V8 binary data files.
 int main(int argc, char** argv) {
   g_exe_path_ = argv[0];
   testing::InitGoogleTest(&argc, argv);
   testing::InitGoogleMock(&argc, argv);
   return RUN_ALL_TESTS();
 }