From 75646cdbb829b36702874f7dcca1fec9a5d23bb6 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 31 Oct 2011 13:47:43 +1300
Subject: [PATCH] Bug 688365 - Enable Skia 'New AA' mode. r=jrmuizel

---
 gfx/skia/new-aa.patch                 | 22 ++++++++++++++++++++++
 gfx/skia/src/core/SkScan_AntiPath.cpp |  2 +-
 gfx/skia/update.sh                    |  2 ++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 gfx/skia/new-aa.patch

diff --git a/gfx/skia/new-aa.patch b/gfx/skia/new-aa.patch
new file mode 100644
index 00000000000..d03b56dbb06
--- /dev/null
+++ b/gfx/skia/new-aa.patch
@@ -0,0 +1,22 @@
+diff --git a/gfx/skia/src/core/SkScan_AntiPath.cpp b/gfx/skia/src/core/SkScan_AntiPath.cpp
+--- a/gfx/skia/src/core/SkScan_AntiPath.cpp
++++ b/gfx/skia/src/core/SkScan_AntiPath.cpp
+@@ -26,17 +26,17 @@
+         this is often faster for large objects with big spans
+ 
+     NEW_AA is a set of code-changes to try to make both paths produce identical
+     results. Its not quite there yet, though the remaining differences may be
+     in the subsequent blits, and not in the different masks/runs...
+  */
+ //#define FORCE_SUPERMASK
+ //#define FORCE_RLE
+-//#define SK_SUPPORT_NEW_AA
++#define SK_SUPPORT_NEW_AA
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ class BaseSuperBlitter : public SkBlitter {
+ public:
+     BaseSuperBlitter(SkBlitter* realBlitter, const SkIRect& ir,
+                      const SkRegion& clip);
+ 
diff --git a/gfx/skia/src/core/SkScan_AntiPath.cpp b/gfx/skia/src/core/SkScan_AntiPath.cpp
index fae5cb2e7e9..3b893009b6f 100644
--- a/gfx/skia/src/core/SkScan_AntiPath.cpp
+++ b/gfx/skia/src/core/SkScan_AntiPath.cpp
@@ -31,7 +31,7 @@
  */
 //#define FORCE_SUPERMASK
 //#define FORCE_RLE
-//#define SK_SUPPORT_NEW_AA
+#define SK_SUPPORT_NEW_AA
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/gfx/skia/update.sh b/gfx/skia/update.sh
index a2999e7870d..0184fbb2b02 100755
--- a/gfx/skia/update.sh
+++ b/gfx/skia/update.sh
@@ -99,3 +99,5 @@ patch -p3 < arm-opts.patch
 patch -p3 < fix-gradient-clamp.patch
 # Bug 687189 - Implement SkPaint::getPosTextPath.
 patch -p3 < getpostextpath.patch
+# Bug 688365 - Enable Skia 'New AA' mode.
+patch -p3 < new-aa.patch