diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-08 14:24:37 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-08 14:24:37 -0800 |
| commit | 1b97664bc5b84c7a2b87cc656f8c6a0476f9b71f (patch) | |
| tree | 11c6727d7fa3d2dac36b879c3bbd106326c7ca43 /fpdfsdk/include | |
| parent | 6a1c51b9eb666f2e120ec098d900663627ebcb3e (diff) | |
| download | pdfium-1b97664bc5b84c7a2b87cc656f8c6a0476f9b71f.tar.xz | |
Merge to XFA: Clean up misc nits found while fixing bugs.
Some bits regressed in commit 338805f.
Also merge: IWYU fix after commit c5a8933.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1544963002 .
Review URL: https://codereview.chromium.org/1570973002 .
(cherry picked from commit c5a8933f260ca1034fde902058442984e55c0f7a)
(cherry picked from commit e6bd31873c3dba3f79c5ebbbefed636948629cc9)
Review URL: https://codereview.chromium.org/1577453002 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_baseform.h | 4 | ||||
| -rw-r--r-- | fpdfsdk/include/fsdk_define.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index 0ee99ce5e4..023ea74148 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -281,10 +281,6 @@ class CPDFSDK_InterForm : public CPDF_FormNotify { void XfaSetValidationsEnabled(FX_BOOL bEnabled); #endif // PDF_ENABLE_XFA -#ifdef _WIN32 - CPDF_Stream* LoadImageFromFile(const CFX_WideString& sFile); -#endif - void OnKeyStrokeCommit(CPDF_FormField* pFormField, CFX_WideString& csValue, FX_BOOL& bRC); diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index c47839b1fd..708e8174a2 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -11,7 +11,6 @@ #include "core/include/fpdfapi/fpdf_pageobj.h" #include "core/include/fpdfapi/fpdf_parser.h" #include "core/include/fpdfapi/fpdf_render.h" -#include "core/include/fpdfapi/fpdf_serial.h" #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fpdfdoc/fpdf_vt.h" #include "core/include/fxge/fx_ge.h" |