diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-13 01:01:06 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-13 01:01:06 -0700 |
| commit | 366e1c47335717b73d14b804020291758c8afc38 (patch) | |
| tree | 74c8503b4614fb949db17a9010e38365d33eb427 /core/include/fpdfapi/fpdf_parser.h | |
| parent | 95e854f3d8a6e1971b4538cc57c6e7c533b4aaed (diff) | |
| download | pdfium-366e1c47335717b73d14b804020291758c8afc38.tar.xz | |
Merge to XFA: Remove unneeded checks in CPDF_DocPageData::GetFontFileStreamAcc().
The input cannot be null. Same for CPDF_Document::LoadFontFile().
Also set the contract for CPDF_Document::LoadFont() and adjust callers
accordingly.
Also remove unused CPDF_Document::FindFont().
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1184673002.
(cherry picked from commit 1972b16849fedfda675eacd5c8594b54dbd1264d)
Review URL: https://codereview.chromium.org/1181393002.
Diffstat (limited to 'core/include/fpdfapi/fpdf_parser.h')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 0a08df8df9..a5020ebd2c 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -114,12 +114,8 @@ public: FX_BOOL IsFormStream(FX_DWORD objnum, FX_BOOL& bForm) const; - - - - CPDF_Font* LoadFont(CPDF_Dictionary* pFontDict); - - CPDF_Font* FindFont(CPDF_Dictionary* pFontDict); + // |pFontDict| must not be null. + CPDF_Font* LoadFont(CPDF_Dictionary* pFontDict); CPDF_ColorSpace* LoadColorSpace(CPDF_Object* pCSObj, CPDF_Dictionary* pResources = NULL); |