From 8fec3e42ed57a988ad5e7faae5e6a83847a3267e Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Wed, 4 Nov 2015 15:32:02 -0800
Subject: Merge to XFA: Make checkdeps --resolve-dotdot succeed.
This is just a straight-forward, partial merge. It does not
actually make checkdeps succeed.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1419373005 .
(cherry picked from commit 79f5a32175293620abe456554e10efb7c3f4e7c6)
Review URL: https://codereview.chromium.org/1409153007 .
---
core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp | 1 -
core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
(limited to 'core/src/fpdfapi/fpdf_parser')
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
index 3da522da4e..bcade63831 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
@@ -5,7 +5,6 @@
#include <cstring>
#include <string>
-#include "../../../../public/fpdfview.h"
#include "../../../../testing/fx_string_testhelpers.h"
#include "../../../include/fpdfapi/fpdf_parser.h"
#include "../../../include/fxcrt/fx_basic.h"
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
index 2aea614226..f6a2158c53 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
@@ -2675,18 +2675,13 @@ class CPDF_DataAvail final : public IPDF_DataAvail {
CPDF_DataAvail(IFX_FileAvail* pFileAvail, IFX_FileRead* pFileRead);
~CPDF_DataAvail() override;
+ // IPDF_DataAvail:
FX_BOOL IsDocAvail(IFX_DownloadHints* pHints) override;
-
void SetDocument(CPDF_Document* pDoc) override;
-
FX_BOOL IsPageAvail(int iPage, IFX_DownloadHints* pHints) override;
-
int32_t IsFormAvail(IFX_DownloadHints* pHints) override;
-
int32_t IsLinearizedPDF() override;
-
FX_BOOL IsLinearized() override { return m_bLinearized; }
-
void GetLinearizedMainXRefInfo(FX_FILESIZE* pPos, FX_DWORD* pSize) override;
protected:
--
cgit v1.2.3