summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2015-01-27 12:22:15 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-27 20:24:09 +0000
commit9e41970b70e45478bb08c2378787e4c13ab5ea27 (patch)
tree77f4915d4462e6d181c62884343c190601258264
parent3c598102874c539a4b5e7f9bc51f624f245827dc (diff)
downloadchromium_src-9e41970b70e45478bb08c2378787e4c13ab5ea27.zip
chromium_src-9e41970b70e45478bb08c2378787e4c13ab5ea27.tar.gz
chromium_src-9e41970b70e45478bb08c2378787e4c13ab5ea27.tar.bz2
Roll pdfium to eef005055d6aafc2cc6066af37ce47d8b15ec7cd
There is a small API change in a recently-added pdfium API exposed by this roll, so pdfium_engine.cc is simultaneously updated to match. This pulls in: eef0050 Kill scattered extern _PDF_CharType declarations. a039323 Fix infinite recursion in CPDF_Parser::ParseIndirectObjectAt(). fa370ac Fix test naming in previous commit. e0bbe4a Fix null crash in CheckTrailer. af9be4f Add pdfium_embeddertests to BUILD.gn 36faa4a Fix build of pdfium_embeddertest under V8_USE_EXTERNAL_STARTUP_DATA. 219e462 Use IPDF_DataAvail interface to hide CPDF_DataAvail. 83f96a0 Add API tests: NamedDestsByName, DestGetPageIndex. 9dcd7b8 Add tests for GetNamedDests() API. dc43b32 Use signed long for FPDF_GetNamedDest buffer length. 0185408 Simplify UTF16LE_Encode and add unittest. Review URL: https://codereview.chromium.org/881013002 Cr-Commit-Position: refs/heads/master@{#313344}
-rw-r--r--DEPS2
-rw-r--r--pdf/pdfium/pdfium_engine.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 23fc918..3c444a2 100644
--- a/DEPS
+++ b/DEPS
@@ -72,7 +72,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling PDFium
# and whatever else without interference from each other.
- 'pdfium_revision': 'aa7b4ede03764a5701a477b601720a32c88d8e42',
+ 'pdfium_revision': 'eef005055d6aafc2cc6066af37ce47d8b15ec7cd',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling openmax_dl
# and whatever else without interference from each other.
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc
index cb323bb..fd36d72 100644
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -2392,7 +2392,7 @@ pp::VarDictionary PDFiumEngine::GetNamedDestinations() {
pp::VarDictionary named_destinations;
for (unsigned long i = 0; i < FPDF_CountNamedDests(doc_); i++) {
base::string16 name;
- unsigned long buffer_bytes;
+ long buffer_bytes;
FPDF_GetNamedDest(doc_, i, NULL, buffer_bytes);
size_t name_length = buffer_bytes / sizeof(base::string16::value_type);
if (name_length > 0) {