| Index: testing/embedder_test.cpp
|
| diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
|
| index 9d99084050f1a2c7a718e691b23aea0854c5623b..7b984744ac87ca9055836ecb76586307ec721b9f 100644
|
| --- a/testing/embedder_test.cpp
|
| +++ b/testing/embedder_test.cpp
|
| @@ -14,8 +14,8 @@
|
| #include <utility>
|
| #include <vector>
|
|
|
| +#include "../public/fpdf_dataavail.h"
|
| #include "../public/fpdf_text.h"
|
| -#include "../public/fpdfview.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| #ifdef PDF_ENABLE_V8
|
| @@ -215,16 +215,39 @@ bool EmbedderTest::OpenDocument(const std::string& filename) {
|
| hints_.AddSegment = Add_Segment;
|
|
|
| avail_ = FPDFAvail_Create(&file_avail_, &file_access_);
|
| - (void)FPDFAvail_IsDocAvail(avail_, &hints_);
|
| -
|
| - if (!FPDFAvail_IsLinearized(avail_)) {
|
| - document_ = FPDF_LoadCustomDocument(&file_access_, nullptr);
|
| - } else {
|
| + if (FPDFAvail_IsLinearized(avail_) == PDF_LINEARIZED) {
|
| 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_NOTAVAIL) {
|
| + 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);
|
| + 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));
|
|
|