swith over from SkPaint::FilterLevel to SkFilterQuality

swith over from SkPaint::FilterLevel to SkFilterQuality

BUG=skia:

needed manual rebase -- abandoning in favor of https://codereview.chromium.org/1014533004/

[reed2, 2015-03-15 19:56:51]

reed@chromium.org changed reviewers:
+ scroggo@google.com

[reed2, 2015-03-15 19:56:52]

need to check android ...

[reed2, 2015-03-15 20:43:57]

The CQ bit was checked by reed@chromium.org

[commit-bot: I haz the power, 2015-03-15 20:44:03]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1009183002/1

[commit-bot: I haz the power, 2015-03-15 20:44:04]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-03-16 02:44 UTC

[reed2, 2015-03-15 20:44:57]

The CQ bit was unchecked by reed@chromium.org

[reed2, 2015-03-15 21:00:49]

The CQ bit was checked by reed@chromium.org

[commit-bot: I haz the power, 2015-03-15 21:00:54]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1009183002/20001

[commit-bot: I haz the power, 2015-03-15 21:00:55]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-03-16 03:00 UTC

[reed2, 2015-03-15 21:02:02]

The CQ bit was unchecked by reed@chromium.org

[reed2, 2015-03-15 21:10:16]

The CQ bit was checked by reed@chromium.org

[commit-bot: I haz the power, 2015-03-15 21:10:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1009183002/40001

[commit-bot: I haz the power, 2015-03-15 21:10:21]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-03-16 03:10 UTC

[reed2, 2015-03-15 21:11:44]

The CQ bit was unchecked by reed@chromium.org

[scroggo, 2015-03-16 12:58:53]

On 2015/03/15 19:56:52, reed2 wrote:
> need to check android ...

I see five instances:
https://cs.corp.google.com/#search/&q=FilterLevel%20-file:external/skia%20lan...

I'll approve with SK_SUPPORT_LEGACY_FILTERLEVEL_ENUM in
skia_for_android_framework_defines.gypi

[reed1, 2015-03-16 15:40:19]

reed@google.com changed reviewers:
+ reed@google.com

[reed1, 2015-03-16 15:40:20]

ptal -- android call sites updated

[scroggo, 2015-03-16 15:41:16]

On 2015/03/16 15:40:20, reed1 wrote:
> ptal -- android call sites updated

LGTM

[reed1, 2015-03-16 15:42:07]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2015-03-16 15:42:18]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1009183002/40001

[commit-bot: I haz the power, 2015-03-16 15:42:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-16 15:42:38]

Failed to apply patch for include/core/SkPaint.h:
While running git apply --index -3 -p1;
  error: patch failed: include/core/SkPaint.h:338
  Falling back to three-way merge...
  Applied patch to 'include/core/SkPaint.h' with conflicts.
  U include/core/SkPaint.h

Patch:       include/core/SkPaint.h
Index: include/core/SkPaint.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index
bb5eff4d91cc47084e3e92ad5145e7c6a1d3e367..d5c750666de009cec068f67528dda69733958b50
100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -14,9 +14,6 @@
 #include "SkMatrix.h"
 #include "SkXfermode.h"
 
-// TODO: clean up Skia internals so we can remove this and only keep it for
clients
-#define SK_SUPPORT_LEGACY_FILTERLEVEL_ENUM
-
 class SkAnnotation;
 class SkAutoGlyphCache;
 class SkColorFilter;
@@ -338,6 +335,7 @@ public:
      */
     void setFilterQuality(SkFilterQuality quality);
 
+#ifdef SK_SUPPORT_LEGACY_FILTERLEVEL_ENUM
     /**
      *  If the predicate is true, set the filterLevel to Low, else set it to
      *  None.
@@ -354,6 +352,7 @@ public:
     bool isFilterBitmap() const {
         return kNone_FilterLevel != this->getFilterLevel();
     }
+#endif
 
     /** Styles apply to rect, oval, path, and text.
         Bitmaps are always drawn in "fill", and lines are always drawn in