Roll third_party/skia/ b5b6f29d6..7d56b9cc7 (100 commits)
https://skia.googlesource.com/skia.git/+log/b5b6f29d690f..7d56b9cc7ce9
Created with:
roll-dep third_party/skia
Then update skia/BUILD.gn's Fontations build rules to match Chromium's,
which are set up to better deal with Skia-side changes.
Change-Id: Ia602c87c003d609e9a2b12d237f6e30193b5aa4c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/130590
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/DEPS b/DEPS
index ccd0cda..fb9bd04 100644
--- a/DEPS
+++ b/DEPS
@@ -208,7 +208,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling skia
# and whatever else without interference from each other.
- 'skia_revision': 'b5b6f29d690f830cfc7cbad5d059f972b413db75',
+ 'skia_revision': '7d56b9cc7ce95828f7e2afa692483b78a820af2e',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling test_fonts
# and whatever else without interference from each other.
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 73e8684..8b06c69 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -28,14 +28,14 @@
if (pdf_enable_fontations) {
source_set("path_bridge") {
- sources = [ "//third_party/skia/src/ports/fontations/src/skpath_bridge.h" ]
+ sources = skia_fontations_path_bridge_sources
}
rust_static_library("bridge_rust_side") {
allow_unsafe = true
- crate_root = "//third_party/skia/src/ports/fontations/src/ffi.rs"
- sources = [ "//third_party/skia/src/ports/fontations/src/ffi.rs" ]
- cxx_bindings = [ "//third_party/skia/src/ports/fontations/src/ffi.rs" ]
+ crate_root = skia_fontations_bridge_root
+ sources = skia_ports_fontations_bridge_rust_side_sources
+ cxx_bindings = [ skia_fontations_bridge_root ]
deps = [
":path_bridge",
"//third_party/rust/font_types/v0_8:lib",