Sync S8: merge upstream PDFium up to 3c9748bd6 (Sep 30 2026)

.github/workflows/release-libpdfium.yml

@@ -162,6 +162,9 @@ jobs:
             throw "rc.exe not found in $rcPath"
           }
           $rcPath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          # build/ pins a Windows SDK the runner may not have; build with the
+          # newest one it does have (patches/embedpdf-runtime/win/build.patch).
+          "EMBEDPDF_WIN_SDK_VERSION=$($sdk.Name)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       - name: Build target
         shell: bash
         run: scripts/embedpdf-runtime/build-target.sh "${{ matrix.target }}"

AUTHORS

@@ -31,6 +31,7 @@ Huy Ngo <huyna89@gmail.com>
 Ivan Odulo <ivanodulo@gmail.com>
 Jeroen Bobbeldijk <jerbob92@gmail.com>
 Jiang Jiang <jiangj@opera.com>
+Jimin Lee <cliceleee@gmail.com>
 Justin Pierce <brkfstmnchr@gmail.com>
 Ke Liu <stackexploit@gmail.com>
 Luật Nguyễn <manhluat93.php@gmail.com>
@@ -55,6 +56,7 @@ Tyler Denniston <denniston.t@gmail.com>
 Wang Chuan <jdyaomo@gmail.com>
 Wang Qing <wangqing-hf@loongson.cn>
 Wang Yongjie <tycket033@gmail.com>
+Xonaman <xonaman738@gmail.com>
 Zhuo Qingliang <zhuo.dev@gmail.com>
 # END individuals section.
 

BUILD.gn

@@ -29,6 +29,7 @@ config("pdfium_common_config") {
   cflags_cc = []
   ldflags = []
   include_dirs = [ "." ]
+  inputs = [ "unsafe_buffers_paths.txt" ]
   defines = []
 
   if (!use_system_libopenjpeg2) {
@@ -39,19 +40,15 @@ config("pdfium_common_config") {
     defines += [ "PDF_ENABLE_CLICK_LOGGING" ]
   }
 
-  if (pdf_use_skia && pdf_enable_fontations) {
+  if (pdf_enable_fontations) {
     defines += [ "PDF_ENABLE_FONTATIONS" ]
   }
 
-  if (pdf_use_skia && pdf_enable_skia_typeface_checks) {
-    defines += [ "PDF_ENABLE_SKIA_TYPEFACE_CHECKS" ]
-  }
-
   if (pdf_enable_rust_bmp) {
     defines += [ "PDF_ENABLE_RUST_BMP" ]
   }
 
-  if (pdf_use_skia && pdf_enable_rust_jpeg) {
+  if (pdf_enable_rust_jpeg) {
     defines += [ "PDF_ENABLE_RUST_JPEG" ]
   }
 

DEPS

@@ -90,7 +90,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_ndk
   # and whatever else without interference from each other.
-  'android_ndk_version': Str('2@30.0.15729638'),
+  'android_ndk_version': Str('2@30.0.16138531'),
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling brotli
   # and whatever else without interference from each other.
@@ -118,7 +118,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling code_coverage
   # and whatever else without interference from each other.
-  'code_coverage_revision': 'e1878fbb1ff79de75d54b6b57caa19a92b90079b',
+  'code_coverage_revision': 'a81032f8d6f57774af865e502c5661cf24780ca2',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling cpu_features
   # and whatever else without interference from each other.
@@ -130,7 +130,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling depot_tools
   # and whatever else without interference from each other.
-  'depot_tools_revision': '732902ab86f8bd629bee00af102d5aa2d9336166',
+  'depot_tools_revision': '36a8df4ad006eaa0572fb446edb8145fe5403592',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling dragonbox
   # and whatever else without interference from each other.
@@ -154,7 +154,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling goldctl CIPD package version
   # and whatever else without interference from each other.
-  'goldctl_version': 'git_revision:9379dad302e027bb42a09c353bfbac0166c8c845',
+  'goldctl_version': 'git_revision:63df9e9df52e8edfd3cd86b642ba79f440e96ecd',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling gtest
   # and whatever else without interference from each other.
@@ -174,7 +174,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling instrumented_lib
   # and whatever else without interference from each other.
-  'instrumented_lib_revision': 'd15c278eed5d38d9acf2d8054cf37baba93cef8e',
+  'instrumented_lib_revision': '423262e4438b032c0ba5ea61f78a85ac3690298c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling jinja2
   # and whatever else without interference from each other.
@@ -196,7 +196,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libpng
   # and whatever else without interference from each other.
-  'libpng_revision': '6d5341764ef4e38cbc07d35514a8aa73de50de8a',
+  'libpng_revision': '0179a807421cf96731cdfa10008bba04fda243c1',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libunwind
   # and whatever else without interference from each other.
@@ -224,7 +224,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling pdfium_tests
   # and whatever else without interference from each other.
-  'pdfium_tests_revision': 'd4ec3e1987a094b1eae612943b57782d3b0038ff',
+  'pdfium_tests_revision': '6a4136071608f159f45e274fed1b7d5f4272ca8f',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling result_adapter_revision
   # and whatever else without interference from each other.
@@ -240,7 +240,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling siso
   # and whatever else without interference from each other.
-  'siso_version': 'git_revision:bc45e8f67ae0f37d337190ad64aa8bb440c791eb',
+  'siso_version': 'git_revision:efbbe7f1892211b5e9512576843a3c247b6a6d7c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling skia
   # and whatever else without interference from each other.
@@ -256,7 +256,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling tools_memory
   # and whatever else without interference from each other.
-  'tools_memory_revision': '8d3182bb3c86948e9e27fbfe11d2134c7e29c898',
+  'tools_memory_revision': '0732f7097d066a81e673f90862994f76886fc638',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling tools_rust
   # and whatever else without interference from each other.
@@ -272,7 +272,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling zlib
   # and whatever else without interference from each other.
-  'zlib_revision': 'c5cc9edf8992ff36dfca3c2c4f6c8327a66b6782',
+  'zlib_revision': '285e94b8fa95ad3b7d16b80798ec8dce6febb8c8',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.
@@ -361,11 +361,13 @@ deps = {
   'third_party/android_toolchain/ndk': {
     'packages': [
       {
-        'package': 'chromium/third_party/android_toolchain/android_toolchain',
+        'package': 'chromium/third_party/android_toolchain/android_toolchain/${{platform}}',
         'version': 'version:' + Var('android_ndk_version'),
       },
     ],
-    'condition': 'checkout_android_native_support',
+    'condition': 'checkout_android_native_support and '
+                 '((host_os == "linux" and host_cpu == "x64") or '
+                 '(host_os == "mac" and host_cpu == "arm64"))',
     'dep_type': 'cipd',
   },
 

OWNERS

@@ -1,4 +1,3 @@
-npm@chromium.org
 thestig@chromium.org
 tsepez@chromium.org
 

build_overrides/build.gni

@@ -26,6 +26,11 @@ asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc"
 lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc"
 tsan_suppressions_file = "//build/sanitizers/tsan_suppressions.cc"
 
+vpython_spec_files = [
+  "//vpython.toml",
+  "//vpython.toml.uv.lock",
+]
+
 declare_args() {
   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
   # due to 4GiB file size limit, see https://crbug.com/648948.

core/fpdfapi/edit/BUILD.gn

@@ -51,7 +51,6 @@ source_set("edit") {
     "../../../:pdfium_noshorten_config",
   ]
   deps = [
-    ":contentstream_write_utils",
     "../../../constants",
     "../../fxcrt",
     "../font",
@@ -67,24 +66,8 @@ source_set("edit") {
   visibility = [ "../../../*" ]
 }
 
-source_set("contentstream_write_utils") {
-  sources = [
-    "cpdf_contentstream_write_utils.cpp",
-    "cpdf_contentstream_write_utils.h",
-  ]
-  configs += [
-    "../../../:pdfium_strict_config",
-    "../../../:pdfium_noshorten_config",
-  ]
-  deps = [
-    "../../fxcrt",
-    "//third_party/dragonbox",
-  ]
-}
-
 pdfium_unittest_source_set("unittests") {
   sources = [
-    "cpdf_contentstream_write_utils_unittest.cpp",
     "cpdf_creator_unittest.cpp",
     "cpdf_npagetooneexporter_unittest.cpp",
     "cpdf_pagecontentgenerator_unittest.cpp",
@@ -95,8 +78,8 @@ pdfium_unittest_source_set("unittests") {
     "cpdf_tounicodecmap_unittest.cpp",
   ]
   deps = [
-    ":contentstream_write_utils",
     ":edit",
+    "../../fxcrt",
     "../../fxge",
     "../font",
     "../page",

core/fpdfapi/edit/cpdf_npagetooneexporter.cpp

@@ -12,7 +12,6 @@
 #include <utility>
 
 #include "constants/page_object.h"
-#include "core/fpdfapi/edit/cpdf_contentstream_write_utils.h"
 #include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
@@ -27,6 +26,7 @@
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/fx_string_wrappers.h"
 #include "core/fxcrt/span.h"
+#include "core/fxcrt/stream_write_utils.h"
 
 namespace {
 

core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp

@@ -17,7 +17,6 @@
 #include <vector>
 
 #include "constants/page_object.h"
-#include "core/fpdfapi/edit/cpdf_contentstream_write_utils.h"
 #include "core/fpdfapi/edit/cpdf_pagecontentmanager.h"
 #include "core/fpdfapi/edit/cpdf_resourceuse.h"
 #include "core/fpdfapi/edit/cpdf_stringarchivestream.h"
@@ -57,6 +56,7 @@
 #include "core/fxcrt/notreached.h"
 #include "core/fxcrt/numerics/safe_conversions.h"
 #include "core/fxcrt/span.h"
+#include "core/fxcrt/stream_write_utils.h"
 #include "core/fxcrt/zip.h"
 #include "core/fxge/cfx_graphstate.h"
 

core/fpdfapi/edit/cpdf_text_redactor.cpp

@@ -9,7 +9,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "core/fpdfapi/edit/cpdf_contentstream_write_utils.h"
+#include "core/fxcrt/stream_write_utils.h"
 #include "core/fpdfapi/edit/cpdf_image_redactor.h"
 #include "core/fpdfapi/edit/cpdf_path_redactor.h"
 #include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"

core/fpdfapi/font/cpdf_cmap.cpp

@@ -16,6 +16,7 @@
 #include "core/fpdfapi/font/cpdf_fontglobals.h"
 #include "core/fpdfapi/parser/cpdf_simple_parser.h"
 #include "core/fxcrt/check.h"
+#include "core/fxcrt/fx_ceil_div.h"
 #include "core/fxcrt/notreached.h"
 
 namespace {
@@ -421,7 +422,7 @@ size_t CPDF_CMap::CountChar(ByteStringView pString) const {
     case OneByte:
       return pString.GetLength();
     case TwoBytes:
-      return (pString.GetLength() + 1) / 2;
+      return fxcrt::CeilDiv(pString.GetLength(), 2);
     case MixedTwoBytes: {
       size_t count = 0;
       for (size_t i = 0; i < pString.GetLength(); i++) {

core/fpdfapi/font/cpdf_tounicodemap.cpp

@@ -373,13 +373,32 @@ void CPDF_ToUnicodeMap::SetCode(uint32_t srccode, WideString destcode) {
 }
 
 void CPDF_ToUnicodeMap::InsertIntoMaps(uint32_t code, uint32_t destcode) {
-  auto [it, inserted] = map_.insert({code, destcode});
-  if (!inserted) {
-    it->second = std::min(it->second, destcode);
-  }
-
-  auto [reverse_it, reverse_inserted] = reverse_map_.insert({destcode, code});
-  if (!reverse_inserted) {
-    reverse_it->second = std::min(reverse_it->second, code);
-  }
+  // Adobe TN #5014, "Adobe CMap and CIDFont Files Specification": "Code
+  // mappings (unlike codespace ranges) may overlap, but succeeding maps
+  // superceded preceding maps." A later bfchar or bfrange entry therefore
+  // replaces an earlier mapping for the same code, which subset fonts rely on
+  // when a catch-all bfrange is followed by overrides for individual codes.
+  map_[code] = destcode;
+  reverse_map_[destcode] = code;
+
+  // TODO(crbug.com/554790604): Two rough edges remain here.
+  //
+  // A superseded mapping leaves an orphaned entry behind in `reverse_map_`:
+  // after InsertIntoMaps(1, 2) and then InsertIntoMaps(1, 3), `map_` holds
+  // {1: 3} but `reverse_map_` holds {2: 1, 3: 1}, so ReverseLookup(2) still
+  // answers 1 for a mapping that no longer exists. Rebuilding `reverse_map_`
+  // from the finished `map_` removes those, but it changes which charcode
+  // font subsetting picks, so it needs its own change.
+  //
+  // Also, last-wins is only meaningful for a CMap that a producer authored.
+  // LoadCompositeFont() collects a font's cmap into a multimap keyed by glyph,
+  // so a glyph that several unicodes reach contributes several entries, and
+  // LoadUnicode() then emits overlapping bfranges for it. Which of those wins
+  // comes down to the order they were emitted in rather than to the font, and
+  // no ordering is right for all of them. Among the pairs
+  // FPDFSaveWithFontSubsetEmbedderTest covers, last-wins picks U+4E00 over
+  // U+2F00, which is the better answer, but also U+F906 over U+53E5 and
+  // U+00A0 over U+0020, which are worse; lowest-wins gets those same three
+  // the other way round. Making that CMap map each charcode once is the real
+  // fix.
 }