external: update pdfium to 4500

Change-Id: I38c85fb3e30ffd1f7fc0a11948fc01338f7bb205
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115444
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

4 files changed, 17 insertions, 21 deletions

diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index 1a0d6c814122..e048c8dab0d5 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -286,7 +286,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
 
 # fpdfdoc
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
-    UnpackedTarball/pdfium/core/fpdfdoc/cline \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_aaction \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_action \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_annot \
@@ -307,18 +306,17 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_nametree \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_numbertree \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_pagelabel \
-    UnpackedTarball/pdfium/core/fpdfdoc/cpdf_variabletext \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_viewerpreferences \
     UnpackedTarball/pdfium/core/fpdfdoc/cpvt_fontmap \
-    UnpackedTarball/pdfium/core/fpdfdoc/cpvt_generateap \
     UnpackedTarball/pdfium/core/fpdfdoc/cpvt_wordinfo \
-    UnpackedTarball/pdfium/core/fpdfdoc/csection \
-    UnpackedTarball/pdfium/core/fpdfdoc/ctypeset \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_structelement \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_structtree \
-    UnpackedTarball/pdfium/core/fpdfdoc/cba_fontmap \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_color_utils \
     UnpackedTarball/pdfium/core/fpdfdoc/cpdf_icon \
+    UnpackedTarball/pdfium/core/fpdfdoc/cpdf_bafontmap \
+    UnpackedTarball/pdfium/core/fpdfdoc/cpdf_generateap \
+    UnpackedTarball/pdfium/core/fpdfdoc/cpvt_section \
+    UnpackedTarball/pdfium/core/fpdfdoc/cpvt_variabletext \
 ))
 
 # fpdftext
@@ -490,9 +488,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_caret \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_combo_box \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit \
-    UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_ctrl \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_impl \
-    UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_icon \
+    UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_sbbutton \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_box \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_cbbutton \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_cblistbox \
@@ -652,7 +649,7 @@ ifeq ($(OS),MACOSX)
 # fxge
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fxge/apple/fx_apple_platform \
-    UnpackedTarball/pdfium/core/fxge/apple/fx_mac_impl \
+    UnpackedTarball/pdfium/core/fxge/apple/fx_apple_impl \
     UnpackedTarball/pdfium/core/fxge/apple/fx_quartz_device \
 ))
 
@@ -666,7 +663,7 @@ ifeq ($(OS),iOS)
 # fxge
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fxge/apple/fx_apple_platform \
-    UnpackedTarball/pdfium/core/fxge/apple/fx_mac_impl \
+    UnpackedTarball/pdfium/core/fxge/apple/fx_apple_impl \
     UnpackedTarball/pdfium/core/fxge/apple/fx_quartz_device \
 ))
 
@@ -691,7 +688,7 @@ endif
 ifeq ($(OS),LINUX)
 # fxge
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
-    UnpackedTarball/pdfium/core/fxge/fx_ge_linux \
+    UnpackedTarball/pdfium/core/fxge/linux/fx_linux_impl \
 ))
 endif
 
diff --git a/external/pdfium/README b/external/pdfium/README
index c1719cf0a152..0a146d2e74de 100644
--- a/external/pdfium/README
+++ b/external/pdfium/README
@@ -8,6 +8,8 @@ https://pdfium.googlesource.com/pdfium/
 How to update the tarball:
 
 version=$(git for-each-ref|grep chromium/|tail -n 1|sed 's|.*/||')
+git checkout --track origin/chromium/$version
+gclient sync
 git archive --prefix=pdfium/ --format=tar origin/chromium/${version} > pdfium-${version}.tar
 (cd ..; tar --append --file pdfium/pdfium-${version}.tar pdfium/third_party/freetype/src/include/ pdfium/third_party/freetype/src/src/)
 bzip2 pdfium-${version}.tar
diff --git a/external/pdfium/cg-instead-of-carbon.patch.1 b/external/pdfium/cg-instead-of-carbon.patch.1
index bd29af1b95c2..d46b776cd849 100644
--- a/external/pdfium/cg-instead-of-carbon.patch.1
+++ b/external/pdfium/cg-instead-of-carbon.patch.1
@@ -9,5 +9,4 @@
 +#include <CoreGraphics/CoreGraphics.h>
  
  #include "core/fxcrt/fx_system.h"
- #include "core/fxge/cfx_gemodule.h"
-
+ #include "core/fxcrt/retain_ptr.h"
diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx
index 772d3e6590d4..d12256852e72 100644
--- a/external/pdfium/inc/pch/precompiled_pdfium.hxx
+++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx
@@ -48,6 +48,7 @@
 #include <map>
 #include <memory>
 #include <numeric>
+#include <ostream>
 #include <set>
 #include <setjmp.h>
 #include <sstream>
@@ -197,13 +198,12 @@
 #include <core/fpdfapi/render/cpdf_textrenderer.h>
 #include <core/fpdfapi/render/cpdf_type3cache.h>
 #include <core/fpdfapi/render/cpdf_type3glyphmap.h>
-#include <core/fpdfdoc/cba_fontmap.h>
-#include <core/fpdfdoc/cline.h>
 #include <core/fpdfdoc/cpdf_aaction.h>
 #include <core/fpdfdoc/cpdf_action.h>
 #include <core/fpdfdoc/cpdf_annot.h>
 #include <core/fpdfdoc/cpdf_annotlist.h>
 #include <core/fpdfdoc/cpdf_apsettings.h>
+#include <core/fpdfdoc/cpdf_bafontmap.h>
 #include <core/fpdfdoc/cpdf_bookmark.h>
 #include <core/fpdfdoc/cpdf_bookmarktree.h>
 #include <core/fpdfdoc/cpdf_color_utils.h>
@@ -212,6 +212,7 @@
 #include <core/fpdfdoc/cpdf_filespec.h>
 #include <core/fpdfdoc/cpdf_formcontrol.h>
 #include <core/fpdfdoc/cpdf_formfield.h>
+#include <core/fpdfdoc/cpdf_generateap.h>
 #include <core/fpdfdoc/cpdf_icon.h>
 #include <core/fpdfdoc/cpdf_iconfit.h>
 #include <core/fpdfdoc/cpdf_interactiveform.h>
@@ -223,14 +224,12 @@
 #include <core/fpdfdoc/cpdf_pagelabel.h>
 #include <core/fpdfdoc/cpdf_structelement.h>
 #include <core/fpdfdoc/cpdf_structtree.h>
-#include <core/fpdfdoc/cpdf_variabletext.h>
 #include <core/fpdfdoc/cpdf_viewerpreferences.h>
 #include <core/fpdfdoc/cpvt_fontmap.h>
-#include <core/fpdfdoc/cpvt_generateap.h>
+#include <core/fpdfdoc/cpvt_section.h>
+#include <core/fpdfdoc/cpvt_variabletext.h>
 #include <core/fpdfdoc/cpvt_word.h>
 #include <core/fpdfdoc/cpvt_wordinfo.h>
-#include <core/fpdfdoc/csection.h>
-#include <core/fpdfdoc/ctypeset.h>
 #include <core/fpdfdoc/ipvt_fontmap.h>
 #include <core/fpdftext/cpdf_linkextract.h>
 #include <core/fpdftext/cpdf_textpage.h>
@@ -412,11 +411,10 @@
 #include <fpdfsdk/pwl/cpwl_cblistbox.h>
 #include <fpdfsdk/pwl/cpwl_combo_box.h>
 #include <fpdfsdk/pwl/cpwl_edit.h>
-#include <fpdfsdk/pwl/cpwl_edit_ctrl.h>
 #include <fpdfsdk/pwl/cpwl_edit_impl.h>
-#include <fpdfsdk/pwl/cpwl_icon.h>
 #include <fpdfsdk/pwl/cpwl_list_box.h>
 #include <fpdfsdk/pwl/cpwl_list_ctrl.h>
+#include <fpdfsdk/pwl/cpwl_sbbutton.h>
 #include <fpdfsdk/pwl/cpwl_scroll_bar.h>
 #include <fpdfsdk/pwl/cpwl_special_button.h>
 #include <fpdfsdk/pwl/cpwl_wnd.h>