From 6095260e55ac5f263df26cdde427531a0e7da8dd Mon Sep 17 00:00:00 2001
From: mtklein <mtklein@chromium.org>
Date: Thu, 14 May 2015 10:35:33 -0700
Subject: [PATCH] Temporarily revert just Multiply to see if that's the source
 of NEON diffs.

Local testing is confusing and inconclusive.  Pulling out the big guns.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/5b9f352ff1e245dd48e200f8f8b683f4569547d3

Review URL: https://codereview.chromium.org/1129293005
---
 src/core/SkXfermode.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 2abe55a8ca..4555a85053 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -1489,7 +1489,9 @@ SkXfermode* create_mode(int iMode) {
     switch (mode) {
         case SkXfermode::kSrcATop_Mode:  return SkT4pxXfermode<SrcATop4f>::Create(rec);
         case SkXfermode::kDstATop_Mode:  return SkT4pxXfermode<DstATop4f>::Create(rec);
-        case SkXfermode::kXor_Mode:      return SkT4pxXfermode<Xor4f>::Create(rec);
+        // Temporarily reverted to see if this is the source of NEON diffs.
+        // If not, try DstATop then SrcATop next.  Multiply is not the problem.
+        // case SkXfermode::kXor_Mode:      return SkT4pxXfermode<Xor4f>::Create(rec);
         case SkXfermode::kPlus_Mode:     return SkT4pxXfermode<Plus4f>::Create(rec);
         case SkXfermode::kModulate_Mode: return SkT4pxXfermode<Modulate4f>::Create(rec);
         case SkXfermode::kScreen_Mode:   return SkT4pxXfermode<Screen4f>::Create(rec);