Update some Skia test expectations for Mac ARM64 with macOS 15
Update expectations so the mac_xfa_skia_rust_arm builder's embeddertests
(skia) step passes.
Link to image diffs for Googlers: shortn/_pL4eTb0FiT
Bug: 41480180
Change-Id: I9bf0a7126f373f8382acc917424a326e0393789f
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/137952
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
index 3bae233..d5b674b 100644
--- a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
@@ -435,7 +435,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "092f1ee8785ad74457022d6282784cb1";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "b874d2afb3534d397de160d981cb5a0d";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "c6e53a5348d8869a79d86a1f4745fcaa";
#else
return "c6b3aa2787f557726d6ac0fa7cd4fbfa";
@@ -469,7 +471,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "718af2604bd171f2af09019d7a2a16bb";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "a969eb847d847bad35045c99244c285f";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "168c22e6aa255b7616579a468fb7e311";
#else
return "12d37e0ae880cf2c5743a69467d19756";
@@ -496,7 +500,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "0b9e2044a71465ed8af639527c3cc94a";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "9ee470a530f3138463a901b6c8cd2aed";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "62c1dddb6440dd8180abf51d986141e4";
#else
return "32678124d0789c09aa61028de3a8cbcf";
diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index b2c1a2c..048b478 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -548,7 +548,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "42e03089ef2392579d73bf9065896488";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "3084f8664692e192406d0a296350b581";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "5891aa346046c3f5b8c3cd8607f0d256";
#else
return "d02d468d9022ddf35014daa50191a895";
@@ -772,7 +774,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "c50012ab122cd3706d39f371ca7462ee";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "94b17973cf98c56cde2c3a6847c82371";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "24994ad69aa612a66d183eaf9a92aa06";
#else
return "798fa41303381c9ba6d99092f5cd4d2b";
@@ -894,7 +898,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "31e091a5f6c54059e643b1bdcd344534";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "6aa0d85c5aa0ad304a04daf3124e74bb";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "2975a3f6710dc2b86f766b07edeaaf06";
#else
return "377ee6496bd87d90056691ba5a13d13f";
@@ -910,7 +916,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "45bad83ebcee8cc85fa5dd3e98aaaf0a";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "2ee6444fc5f9404c123bf2329b975a44";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "d7e6b8535dce105ebbb1fa2c7942c64e";
#else
return "17fc1c964d0252a87ddfcc8db960c69a";
@@ -926,7 +934,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "7d3b20c8a0d0899b9e1d208317fdd246";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "06ca188c4f0e153d4b512169cc29904d";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "8a6d9357d93595be326a30223d5ffda4";
#else
return "e5f192fd7c4711ea1ba9a69674c1aa27";
@@ -1370,7 +1380,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "067c891d5c5f3add0779798f2f5d20d0";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "3d5b2cdad126e5daa7c1de43a4282433";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "b2b09967e4aed8faf8218f44650a836d";
#else
return "bc49737f97f2119799be8deb347249fe";
diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index 4cd3304..d63bc1d 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -1457,7 +1457,11 @@
TEST_F(FPDFFormFillEmbedderTest, Bug1281) {
const char* reverse_byte_order_checksum = []() {
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
+#if BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "982dc4898d0ff78920be831538763d65";
+#else
return "8077970bbd10333f18186a9bb459bbe6";
+#endif
}
return "24fff03d1e663b7ece5f6e69ad837124";
}();
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 47db125..b76e783 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -1629,7 +1629,11 @@
const char* gray_checksum = []() {
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
+#if BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "44575dfe9e72e5b4e535766230c640b2";
+#else
return "3dfe1fc3889123d68e1748fefac65e72";
+#endif
}
return "b561c11edc44dc3972125a9b8744fa2f";
}();
@@ -2205,7 +2209,9 @@
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "c18c1b7ee995f16dfb18e6da73a3c2d3";
-#elif BUILDFLAG(IS_APPLE)
+#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "9469d197ead5c3ca2488eb2237befa65";
+#elif BUILDFLAG(IS_APPLE) && !defined(ARCH_CPU_ARM64)
return "92e96cad5e6b93fee3e2017ea27e2497";
#else
return "b73df08d5252615ad6ed2fe7d6c73883";
diff --git a/xfa/fwl/cfwl_edit_embeddertest.cpp b/xfa/fwl/cfwl_edit_embeddertest.cpp
index ee959d2..85a205c 100644
--- a/xfa/fwl/cfwl_edit_embeddertest.cpp
+++ b/xfa/fwl/cfwl_edit_embeddertest.cpp
@@ -271,7 +271,11 @@
FORM_OnLButtonDown(form_handle(), page.get(), 0, 115, 58);
const char* filled_checksum = []() {
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
+#if BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
+ return "062ad65614888e4f114b99f3396be3e8";
+#else
return "23658ed124114f05518372d41c80e41b";
+#endif
}
return "101cf6223fa2403fba4c413a8310ab02";
}();
