commit 557d71a445acf27a5154575bd5862df1671708de
author Brian Osman <brianosman@google.com> Wed Apr 05 20:54:40 2023 +0000
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Apr 05 20:55:16 2023 +0000
tree 39f978162d64a62a6a21673e932fe78225bdc57a
parent c6bda115cf96bf5e03bd3dc5fe67046da3f62da7

Revert "Force analytic AA in all WASM builds"

This reverts commit 1d1783aa55c3c554c84f2b360e65f70f5ee3591c.

Reason for revert: Breaking Flutter

Original change's description:
> Force analytic AA in all WASM builds
>
> Again, this increases size slightly (over forcing SAA), but we will be
> able to win some of that back. More importantly, this keeps up on the
> path of only having one scan converter.
>
> Bug: skia:14232
> Change-Id: I0fb80d1db5b37b777514608a5c2e272e2ba71149
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/666856
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Kevin Lubick <kjlubick@google.com>

Bug: skia:14232
Change-Id: Ia943fcbb8faf27fe4848e5acc3774a67cab44222
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/666864
Auto-Submit: Brian Osman <brianosman@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>

defines.bzl

diff --git a/defines.bzl b/defines.bzl
index 774da9d..c0a0b35 100644
--- a/defines.bzl
+++ b/defines.bzl
@@ -115,7 +115,7 @@
     "//bazel/common_config_settings:cpu_wasm": [
         # working around https://github.com/emscripten-core/emscripten/issues/10072
         "SK_FORCE_8_BYTE_ALIGNMENT",
-        "SK_FORCE_AAA",
+        "SK_DISABLE_AAA",  # This saves about 57KB of code size, uncompressed
     ],
     "//conditions:default": [],
 })

gn/toolchain/wasm.gni

diff --git a/gn/toolchain/wasm.gni b/gn/toolchain/wasm.gni
index de8e0fc..87bbc97 100644
--- a/gn/toolchain/wasm.gni
+++ b/gn/toolchain/wasm.gni
@@ -42,7 +42,7 @@
 
 wasm_defines = [
   "SKNX_NO_SIMD",
-  "SK_FORCE_AAA",
+  "SK_DISABLE_AAA",
   "SK_FORCE_8_BYTE_ALIGNMENT",
 ]
 

modules/canvaskit/BUILD.gn

diff --git a/modules/canvaskit/BUILD.gn b/modules/canvaskit/BUILD.gn
index 592ff50..6b8cdf8 100644
--- a/modules/canvaskit/BUILD.gn
+++ b/modules/canvaskit/BUILD.gn
@@ -347,7 +347,7 @@
     defines += [ "SK_DISABLE_TRACING" ]
   }
   defines += [
-    "SK_FORCE_AAA",
+    "SK_DISABLE_AAA",
     "SK_FORCE_8_BYTE_ALIGNMENT",
     "EMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0",
     "SK_SHAPER_HARFBUZZ_AVAILABLE",

public.bzl

diff --git a/public.bzl b/public.bzl
index d1b5714..8cbe949 100644
--- a/public.bzl
+++ b/public.bzl
@@ -2121,7 +2121,7 @@
     "SK_DISABLE_LEGACY_SHADERCONTEXT",
     "SK_DISABLE_TRACING",
     "SK_GL",
-    "SK_FORCE_AAA",
+    "SK_DISABLE_AAA",
     "SK_DISABLE_EFFECT_DESERIALIZATION",
     "SK_FORCE_8_BYTE_ALIGNMENT",
     "SKNX_NO_SIMD",