commit 26dc4e6a0d02b938958895d01a66aeef7c989b08
author Lei Zhang <thestig@chromium.org> Thu Jun 30 20:57:32 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 30 20:57:32 2022 +0000
tree 3d95edb316f9ad7ee2efa610e4cd94066215c067
parent fb74113bc3c1d58295e7dbbba73b34de1c185930

Roll third_party/skia/ ecf0246a7..9a9a6925a (39 commits)

https://skia.googlesource.com/skia.git/+log/ecf0246a7ec8..9a9a6925ac01

To make the build work, include the Skia build config changes in
https://pdfium-review.googlesource.com/94890, after running that through
git cl format.

Created with:
  roll-dep third_party/skia

Change-Id: I6d9271a8784ed11968107a82a03bba716f263daa
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/94871
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nigi <nigi@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index c351c21..d3797c7 100644
--- a/DEPS
+++ b/DEPS
@@ -123,7 +123,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': 'ecf0246a7ec8e053f76abdabe765a5567011809f',
+  'skia_revision': '9a9a6925ac01bbcc904616c35ad6f7d2f8638dfa',
   # 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.

skia/BUILD.gn

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 79d7085..0d7931a 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -6,7 +6,7 @@
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//third_party/skia/gn/shared_sources.gni")
-import("//third_party/skia/third_party/skcms/skcms.gni")
+import("//third_party/skia/modules/skcms/skcms.gni")
 import("features.gni")
 
 if (current_cpu == "arm") {
@@ -157,10 +157,9 @@
     cflags += [ "-mfp16-format=ieee" ]
   }
 
-  public = [ "//third_party/skia/include/third_party/skcms/skcms.h" ]
-  include_dirs = [ "//third_party/skia/include/third_party/skcms" ]
-  sources =
-      rebase_path(skcms_sources, ".", "//third_party/skia/third_party/skcms")
+  public =
+      rebase_path(skcms_public_headers, ".", "//third_party/skia/modules/skcms")
+  sources = rebase_path(skcms_sources, ".", "//third_party/skia/modules/skcms")
 }
 
 component("skia") {