Fix debugger's overdraw color filter

src/utils/debugger/SkDebugCanvas.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkColorPriv.h"
@@ skipping 87 matching lines @@
             SkPackARGB32(0xFF, 170, 185, 212),
             SkPackARGB32(0xFF, 213, 195, 170),
             SkPackARGB32(0xFF, 255, 192, 127),
             SkPackARGB32(0xFF, 255, 185, 85),
             SkPackARGB32(0xFF, 255, 165, 42),
             SkPackARGB32(0xFF, 255, 135, 0),
             SkPackARGB32(0xFF, 255,  95, 0),
             SkPackARGB32(0xFF, 255,  50, 0),
             SkPackARGB32(0xFF, 255,  0, 0)
         };
+ 
 
-        for (size_t i = 0; i < SK_ARRAY_COUNT(gTable)-1; ++i) {
-            if (gTable[i] == dst) {
-                return gTable[i+1];
-            }
+        int idx;
+        if (SkColorGetR(dst) < 64) { // 0
+            idx = 0;
+        } else if (SkColorGetG(dst) < 25) { // 10
+            idx = 9;  // cap at 9 for upcoming increment
+        } else if ((SkColorGetB(dst)+21)/42 > 0) { // 1-6
+            idx = 7 - (SkColorGetB(dst)+21)/42;
+        } else { // 7-9
+            idx = 10 - (SkColorGetG(dst)+22)/45;
         }
+        ++idx;
+        SkASSERT(idx < (int)SK_ARRAY_COUNT(gTable));
 
-        return gTable[SK_ARRAY_COUNT(gTable)-1];
+        return gTable[idx];
     }
 
     Factory getFactory() const SK_OVERRIDE { return NULL; }
 #ifndef SK_IGNORE_TO_STRING
     virtual void toString(SkString* str) const SK_OVERRIDE { str->set("OverdrawXfermode"); }
 #endif
 };
 
 class SkOverdrawFilter : public SkDrawFilter {
 public:
     SkOverdrawFilter() {
         fXferMode = SkNEW(OverdrawXfermode);
     }
 
     virtual ~SkOverdrawFilter() {
         delete fXferMode;
     }
 
     bool filter(SkPaint* p, Type) SK_OVERRIDE {
         p->setXfermode(fXferMode);
+        p->setAntiAlias(false);
         return true;
     }
 
 protected:
     SkXfermode* fXferMode;
 
 private:
     typedef SkDrawFilter INHERITED;
 };
 
@@ skipping 518 matching lines @@
 }
 
 bool SkDebugCanvas::lastClipStackData(const SkPath& devPath) {
     if (fCalledAddStackData) {
         fClipStackData.appendf("<br>");
         addPathData(devPath, "pathOut");
         return true;
     }
     return false;
 }