CPDF_Parser shouldnt be in the business of opening files

Move that operation closer to the embedder's call.

R=thestig@chromium.org

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

3 files changed, 9 insertions, 17 deletions

diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index f80bb24a87..7640c857fa 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -355,8 +355,6 @@ class CPDF_Parser {
   CPDF_Parser();
   ~CPDF_Parser();
 
-  FX_DWORD StartParse(const FX_CHAR* filename, FX_BOOL bReParse = FALSE);
-  FX_DWORD StartParse(const FX_WCHAR* filename, FX_BOOL bReParse = FALSE);
   FX_DWORD StartParse(IFX_FileRead* pFile,
                       FX_BOOL bReParse = FALSE,
                       FX_BOOL bOwnFileRead = TRUE);
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
index d0d449308d..e9c07e2864 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
@@ -116,20 +116,6 @@ static int32_t GetHeaderOffset(IFX_FileRead* pFile) {
   }
   return -1;
 }
-FX_DWORD CPDF_Parser::StartParse(const FX_CHAR* filename, FX_BOOL bReParse) {
-  IFX_FileRead* pFileAccess = FX_CreateFileRead(filename);
-  if (!pFileAccess) {
-    return PDFPARSE_ERROR_FILE;
-  }
-  return StartParse(pFileAccess, bReParse);
-}
-FX_DWORD CPDF_Parser::StartParse(const FX_WCHAR* filename, FX_BOOL bReParse) {
-  IFX_FileRead* pFileAccess = FX_CreateFileRead(filename);
-  if (!pFileAccess) {
-    return PDFPARSE_ERROR_FILE;
-  }
-  return StartParse(pFileAccess, bReParse);
-}
 CPDF_SecurityHandler* FPDF_CreateStandardSecurityHandler();
 CPDF_SecurityHandler* FPDF_CreatePubKeyHandler(void*);
 FX_DWORD CPDF_Parser::StartParse(IFX_FileRead* pFileAccess,
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index a419749e8e..8895dce076 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -155,12 +155,20 @@ DLLEXPORT void STDCALL FPDF_SetSandBoxPolicy(FPDF_DWORD policy,
   return FSDK_SetSandBoxPolicy(policy, enable);
 }
 
+
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path,
                                                   FPDF_BYTESTRING password) {
+  // NOTE: the creation of the file needs to be by the embedder on the
+  // other side of this API.
+  IFX_FileRead* pFileAccess = FX_CreateFileRead((const FX_CHAR*)file_path);
+  if (!pFileAccess) {
+    return nullptr;
+  }
+
   CPDF_Parser* pParser = new CPDF_Parser;
   pParser->SetPassword(password);
 
-  FX_DWORD err_code = pParser->StartParse((const FX_CHAR*)file_path);
+  FX_DWORD err_code = pParser->StartParse(pFileAccess);
   if (err_code) {
     delete pParser;
     ProcessParseError(err_code);