commit b5b2a9162e3e5d17b233d912399daca9be5ed51b
author Tom Sepez <tsepez@chromium.org> Thu Jan 21 11:04:37 2016 -0800
committer Tom Sepez <tsepez@chromium.org> Thu Jan 21 11:04:37 2016 -0800
tree e1ccbe8a5f965cfed2edbcba0cdc889e4404246e
parent e19e06e430f76f1cdb126e772602c9fbc4dd1e8f

Mege to XFA: Redo CPDF_PageObjects - part 1

Original Review URL: https://codereview.chromium.org/1601093009 .
(cherry picked from commit da9355139b5dce270be02af31db326d60f488e8c)

Trivial conflicts/changes in fpdfeditpage.cpp and fpdfxfa_page.cpp.

TBR=ochang@chromium.org

Review URL: https://codereview.chromium.org/1613823003 .

fpdfsdk/src/fpdfview.cpp

diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index a6c1420..a4f345e 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -493,7 +493,7 @@
     return NULL;
   CPDF_Page* pPage = new CPDF_Page;
   pPage->Load(pDoc, pDict);
-  pPage->ParseContent();
+  pPage->ParseContent(nullptr);
   return pPage;
 #endif  // PDF_ENABLE_XFA
 }