From 19e7dba153890a2913ffc27e3137bc51a91ca096 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Fri, 13 Dec 2019 18:03:35 +0000
Subject: [PATCH] Fix PDF Viewer build with XFA enabled.
PDFium removed FPDF_LPFILEHANDLER recently, but we forgot to update the
Chromium side, which still had a FPDF_LPFILEHANDLER reference.
Bug: 1033965
Change-Id: I0c06c777d9ab46da232a500d42479d2688c2c39c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1967568
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#724695}
---
pdf/pdfium/pdfium_form_filler.cc | 2 +-
pdf/pdfium/pdfium_form_filler.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pdf/pdfium/pdfium_form_filler.cc b/pdf/pdfium/pdfium_form_filler.cc
index bb1e54fa01bdd..1408a562680f1 100644
--- a/pdf/pdfium/pdfium_form_filler.cc
+++ b/pdf/pdfium/pdfium_form_filler.cc
@@ -449,7 +449,7 @@ void PDFiumFormFiller::Form_UploadTo(FPDF_FORMFILLINFO* param,
}
// static
-FPDF_LPFILEHANDLER PDFiumFormFiller::Form_DownloadFromURL(
+FPDF_FILEHANDLER* PDFiumFormFiller::Form_DownloadFromURL(
FPDF_FORMFILLINFO* param,
FPDF_WIDESTRING url) {
// NOTE: Think hard about the security implications before allowing
diff --git a/pdf/pdfium/pdfium_form_filler.h b/pdf/pdfium/pdfium_form_filler.h
index 92947955696a6..c75f09d626e45 100644
--- a/pdf/pdfium/pdfium_form_filler.h
+++ b/pdf/pdfium/pdfium_form_filler.h
@@ -115,8 +115,8 @@ class PDFiumFormFiller : public FPDF_FORMFILLINFO, public IPDF_JSPLATFORM {
FPDF_FILEHANDLER* file_handler,
int file_flag,
FPDF_WIDESTRING dest);
- static FPDF_LPFILEHANDLER Form_DownloadFromURL(FPDF_FORMFILLINFO* param,
- FPDF_WIDESTRING url);
+ static FPDF_FILEHANDLER* Form_DownloadFromURL(FPDF_FORMFILLINFO* param,
+ FPDF_WIDESTRING url);
static FPDF_FILEHANDLER* Form_OpenFile(FPDF_FORMFILLINFO* param,
int file_flag,
FPDF_WIDESTRING url,