commit ebed3f77bad86538fbe0eb0e20aa4fe1c79bf4f5
author Hui Yingst <nigi@chromium.org> Tue Nov 17 01:59:49 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Nov 17 01:59:49 2020 +0000
tree 19b9a96dedd94b5164811b4d00bd69dff616da87
parent 71f258b48fefa0be1eb29d37e3cd587f6a735090

Roll third_party/skia/ 4c3486e6f..ae4bb98f1 (1 commit)

https://chromium.googlesource.com/skia.git/+log/4c3486e6f1de..ae4bb98f1366

Created with:
  roll-dep third_party/skia

Meanwhile, update the Skia/SkiaPaths results in some PDFium embedder
tests, which are affected by a reland CL
https://skia-review.googlesource.com/319343.

Change-Id: I75e3fb881040a6913458e903a63fee30c97786b6
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/76412
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Hui Yingst <nigi@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index 4952599..40182c0 100644
--- a/DEPS
+++ b/DEPS
@@ -99,7 +99,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': '4c3486e6f1ded4f058744e02d4ad8ddc60cb9ac2',
+  'skia_revision': 'ae4bb98f13663f3ca37bdbc91b58da715b64c8de',
   # 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.

fpdfsdk/fpdf_flatten_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_flatten_embeddertest.cpp b/fpdfsdk/fpdf_flatten_embeddertest.cpp
index fd7c608..93fded8 100644
--- a/fpdfsdk/fpdf_flatten_embeddertest.cpp
+++ b/fpdfsdk/fpdf_flatten_embeddertest.cpp
@@ -40,13 +40,7 @@
 
 TEST_F(FPDFFlattenEmbedderTest, BUG_861842) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#if defined(OS_WIN)
-  constexpr char kCheckboxChecksum[] = "ec7d1600d179aca614f2231c1f77ccb9";
-#elif defined(OS_APPLE)
-  constexpr char kCheckboxChecksum[] = "c7c687f93fb34a4174bdae33535e0627";
-#else
-  constexpr char kCheckboxChecksum[] = "b8aecddfece463096d51596537a20b61";
-#endif
+  constexpr char kCheckboxChecksum[] = "95fdaa000e81c80892b8d370f77be970";
 #else
 #if defined(OS_WIN)
   constexpr char kCheckboxChecksum[] = "95fba3cb7bce7e0d3c94279f60984e17";

fpdfsdk/fpdf_formfill_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index 7e37a15..e4d2f62 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -1326,17 +1326,10 @@
 #endif
 TEST_F(FPDFFormFillEmbedderTest, MAYBE_FormText) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#if defined(OS_APPLE)
   const char kFocusedTextFormWithAbcChecksum[] =
-      "7f4d3e883301c08b3ca2f53cb78adc58";
+      "42af2135e20deb09cbdbfb6418d86382";
   const char kUnfocusedTextFormWithAbcChecksum[] =
-      "92aa287f6208ad0c78210e68e2a731a3";
-#else
-  const char kFocusedTextFormWithAbcChecksum[] =
-      "e2e2b4e4c7ebd6485a2c0745e41c0115";
-  const char kUnfocusedTextFormWithAbcChecksum[] =
-      "84e808922efcceb82f36d55ed4b2752e";
-#endif  // defined(OS_APPLE)
+      "4a961599a512a08468b26b89d389c30a";
 #else
 #if defined(OS_WIN)
   const char kFocusedTextFormWithAbcChecksum[] =

fpdfsdk/fpdf_view_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 193f372..d9020ff 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -1382,12 +1382,10 @@
 
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
 #if defined(OS_WIN)
-  static const char kLcdTextChecksum[] = "fa4b12e9db8316f699624250307e5106";
-#elif defined(OS_APPLE)
-  static const char kLcdTextChecksum[] = "b0a33a2ab9f26d225bbad1c714d95beb";
+  static const char kLcdTextChecksum[] = "7fca5790ce81c715d74d955ea9939fd8";
 #else
-  static const char kLcdTextChecksum[] = "693563ed2a3f1f6545856377be4bf3b3";
-#endif
+  static const char kLcdTextChecksum[] = "66ecb880a880dd263ff495b28aeda0d1";
+#endif  // defined(OS_WIN)
   static const char kNoSmoothtextChecksum[] =
       "18156d2a55ae142c3870da7229650890";
 #else