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 <list>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "../public/fpdf_dataavail.h"
 #include "../public/fpdf_text.h"
 #include "../public/fpdfview.h"
 #include "test_support.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
 
@@ skipping 60 matching lines @@
 
 #ifdef PDF_ENABLE_V8
   v8::V8::ShutdownPlatform();
   delete platform_;
 #endif  // PDF_ENABLE_V8
 
   delete loader_;
   free(file_contents_);
 }
 
-bool EmbedderTest::OpenDocument(const std::string& filename) {
+bool EmbedderTest::OpenDocument(const std::string& filename,
+                                bool must_linearize) {
   file_contents_ = GetFileContents(filename.c_str(), &file_length_);
   if (!file_contents_)
     return false;
 
   loader_ = new TestLoader(file_contents_, file_length_);
   file_access_.m_FileLen = static_cast<unsigned long>(file_length_);
   file_access_.m_GetBlock = TestLoader::GetBlock;
   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 || must_linearize) {

[Tom Sepez, 2015/10/29 16:20:17]

Actually, we want to test if FPDFAvail_IsLinearized() did its job propery, so
don't use must_linearize to force a particular path.

[jun_fang, 2015/10/30 06:02:43]

Acknowledged.

+    document_ = FPDFAvail_GetDocument(avail_, nullptr);
+    if (!document_) {
+      return false;
+    }
+    int32_t nRet = PDF_DATA_NOTAVAIL;
+    while (nRet == PDF_DATA_NOTAVAIL) {
+      nRet = FPDFAvail_IsDocAvail(avail_, &hints_);
+    }
+    if (nRet == PDF_DATA_ERROR) {
+      return false;
+    }
+    if (FPDFAvail_IsFormAvail(avail_, &hints_) == PDF_FORM_NOTAVAIL) {
+      return false;
+    }
+    int page_count = FPDF_GetPageCount(document_);
+    for (int i = 0; i < page_count; ++i) {
+      nRet = PDF_DATA_NOTAVAIL;
+      while (nRet == PDF_DATA_NOTAVAIL) {
+        nRet = FPDFAvail_IsPageAvail(avail_, i, &hints_);
+      }
+      if (nRet == PDF_DATA_ERROR) {
+        return false;
+      }
+    }
+  } else {
     document_ = FPDF_LoadCustomDocument(&file_access_, nullptr);

[Tom Sepez, 2015/10/29 16:20:17]

However, if we came here, and must_linearize was specified, return error.

[jun_fang, 2015/10/30 06:02:43]

Acknowledged.

-  else
-    document_ = FPDFAvail_GetDocument(avail_, nullptr);
-
-  if (!document_)
-    return false;
+    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();
 }