Chromium Code Reviews| Index: testing/embedder_test.cpp |
| diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp |
| index 9d99084050f1a2c7a718e691b23aea0854c5623b..413afdf7ce94c9f393207a7efe24136f988398d9 100644 |
| --- a/testing/embedder_test.cpp |
| +++ b/testing/embedder_test.cpp |
| @@ -14,8 +14,9 @@ |
| #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 |
| @@ -215,16 +216,24 @@ 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_)) { |
| + 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/pdf
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)); |