summaryrefslogtreecommitdiffstats
path: root/pdf
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2015-05-11 18:08:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-12 01:09:05 +0000
commit35024356bfff4fd374e69b733b77f38271a6107d (patch)
treeef5c8417989b25731f23803584169a7dd6d34a0c /pdf
parent9ad94e6e06201059c08d67b9d9ab4a30a766b541 (diff)
downloadchromium_src-35024356bfff4fd374e69b733b77f38271a6107d.zip
chromium_src-35024356bfff4fd374e69b733b77f38271a6107d.tar.gz
chromium_src-35024356bfff4fd374e69b733b77f38271a6107d.tar.bz2
Roll PDFium to 2daf76f
The most significant change is to expose its public/ directory. This requires simultaneous path changes in src/pdf. This pulls in: 2daf76f Add owners file for PDFium ac19d2d Create top-level public/ header directory. 0627231 Move function prototypes to new doc_utils.h file 6661fd4 Fix compilation under chromium checkouts. 17ea732 Better error from pdfium_test when page too big to render. 470408c Fix errors from commit f0a169e. f0a169e Fix a bunch of -Wunused-but-set-variable warnings. 21031ad Support arrays in nonstd::unique_ptr<>. 1fd0b10 Manual revert of ad2a822ce5c3 9ea57a4 Remove FX_STRSIZE casts, use safe conversions BUG=pdfium:154 Review URL: https://codereview.chromium.org/1140603002 Cr-Commit-Position: refs/heads/master@{#329304}
Diffstat (limited to 'pdf')
-rw-r--r--pdf/DEPS3
-rw-r--r--pdf/pdfium/pdfium_assert_matching_enums.cc4
-rw-r--r--pdf/pdfium/pdfium_engine.cc16
-rw-r--r--pdf/pdfium/pdfium_engine.h8
-rw-r--r--pdf/pdfium/pdfium_mem_buffer_file_read.h2
-rw-r--r--pdf/pdfium/pdfium_mem_buffer_file_write.h2
-rw-r--r--pdf/pdfium/pdfium_page.h6
7 files changed, 21 insertions, 20 deletions
diff --git a/pdf/DEPS b/pdf/DEPS
index 316f7e7..9813a3f 100644
--- a/pdf/DEPS
+++ b/pdf/DEPS
@@ -5,7 +5,8 @@ include_rules = [
"+net",
"+ppapi",
"+printing/units.h",
- "+third_party/pdfium/fpdfsdk/include",
+ "+third_party/pdfium/fpdfsdk/include/pdfwindow",
+ "+third_party/pdfium/public",
"+ui/events/keycodes/keyboard_codes.h",
"+v8/include/v8.h"
]
diff --git a/pdf/pdfium/pdfium_assert_matching_enums.cc b/pdf/pdfium/pdfium_assert_matching_enums.cc
index 559ae6b..a7f6e29 100644
--- a/pdf/pdfium/pdfium_assert_matching_enums.cc
+++ b/pdf/pdfium/pdfium_assert_matching_enums.cc
@@ -6,8 +6,8 @@
#include "ppapi/c/pp_input_event.h"
#include "ppapi/c/private/ppb_pdf.h"
#include "ppapi/c/private/ppp_pdf.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_fwlevent.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_sysfontinfo.h"
+#include "third_party/pdfium/public/fpdf_fwlevent.h"
+#include "third_party/pdfium/public/fpdf_sysfontinfo.h"
#include "ui/events/keycodes/keyboard_codes.h"
#define STATIC_ASSERT_MATCH(np_name, pdfium_name) \
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc
index 76a5c27..b1b83a4 100644
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -34,16 +34,16 @@
#include "ppapi/cpp/var.h"
#include "ppapi/cpp/var_dictionary.h"
#include "printing/units.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_ext.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_flatten.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_searchex.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_sysfontinfo.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_transformpage.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdfedit.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdfppo.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdfsave.h"
#include "third_party/pdfium/fpdfsdk/include/pdfwindow/PDFWindow.h"
#include "third_party/pdfium/fpdfsdk/include/pdfwindow/PWL_FontMap.h"
+#include "third_party/pdfium/public/fpdf_edit.h"
+#include "third_party/pdfium/public/fpdf_ext.h"
+#include "third_party/pdfium/public/fpdf_flatten.h"
+#include "third_party/pdfium/public/fpdf_ppo.h"
+#include "third_party/pdfium/public/fpdf_save.h"
+#include "third_party/pdfium/public/fpdf_searchex.h"
+#include "third_party/pdfium/public/fpdf_sysfontinfo.h"
+#include "third_party/pdfium/public/fpdf_transformpage.h"
#include "ui/events/keycodes/keyboard_codes.h"
using printing::ConvertUnit;
diff --git a/pdf/pdfium/pdfium_engine.h b/pdf/pdfium/pdfium_engine.h
index d3a9a14..c65ae52 100644
--- a/pdf/pdfium/pdfium_engine.h
+++ b/pdf/pdfium/pdfium_engine.h
@@ -21,10 +21,10 @@
#include "ppapi/cpp/image_data.h"
#include "ppapi/cpp/point.h"
#include "ppapi/cpp/var_array.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_dataavail.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdf_progressive.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdfformfill.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdfview.h"
+#include "third_party/pdfium/public/fpdf_dataavail.h"
+#include "third_party/pdfium/public/fpdf_formfill.h"
+#include "third_party/pdfium/public/fpdf_progressive.h"
+#include "third_party/pdfium/public/fpdfview.h"
namespace pp {
class KeyboardInputEvent;
diff --git a/pdf/pdfium/pdfium_mem_buffer_file_read.h b/pdf/pdfium/pdfium_mem_buffer_file_read.h
index 88ec410..419b8c8 100644
--- a/pdf/pdfium/pdfium_mem_buffer_file_read.h
+++ b/pdf/pdfium/pdfium_mem_buffer_file_read.h
@@ -7,7 +7,7 @@
#include <stdlib.h>
-#include "third_party/pdfium/fpdfsdk/include/fpdfview.h"
+#include "third_party/pdfium/public/fpdfview.h"
namespace chrome_pdf {
diff --git a/pdf/pdfium/pdfium_mem_buffer_file_write.h b/pdf/pdfium/pdfium_mem_buffer_file_write.h
index 1795c83..619bc87 100644
--- a/pdf/pdfium/pdfium_mem_buffer_file_write.h
+++ b/pdf/pdfium/pdfium_mem_buffer_file_write.h
@@ -7,7 +7,7 @@
#include <string>
-#include "third_party/pdfium/fpdfsdk/include/fpdfsave.h"
+#include "third_party/pdfium/public/fpdf_save.h"
namespace chrome_pdf {
diff --git a/pdf/pdfium/pdfium_page.h b/pdf/pdfium/pdfium_page.h
index d4174f5..3cca04c 100644
--- a/pdf/pdfium/pdfium_page.h
+++ b/pdf/pdfium/pdfium_page.h
@@ -10,9 +10,9 @@
#include "base/strings/string16.h"
#include "ppapi/cpp/rect.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdfdoc.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdfformfill.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdftext.h"
+#include "third_party/pdfium/public/fpdf_doc.h"
+#include "third_party/pdfium/public/fpdf_formfill.h"
+#include "third_party/pdfium/public/fpdf_text.h"
namespace base {
class Value;