commit daa57bfd4204f5a7d304c580bcf5ad99d0121e1f
author reed <reed@google.com> Fri May 15 10:39:17 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri May 15 10:39:17 2015 -0700
tree 3f3bb0b53b87ef4c5bf350b080f8122e9d2dd987
parent 0135a41e095a433414e21e37b277dab7dcbec373

Revert of antialias matrix-image-filter to get smooth diagonals (patchset #6 id:80002 of https://codereview.chromium.org/1134743003/)

Reason for revert:
likely affect layouttests, so need to add a guard

Original issue's description:
> antialias matrix-image-filter to get smooth diagonals
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/fa33f5a6b770130acdc55f2ffe19dd545665726a

TBR=senorblanco@google.com,robertphillips@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1128823010

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 8849aba..34d6aaa 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -992,8 +992,6 @@
     flags |= kClipToLayer_SaveFlag;
 #endif
 
-    SkImageFilter* imgf = paint ? paint->getImageFilter() : NULL;
-
     // do this before we create the layer. We don't call the public save() since
     // that would invoke a possibly overridden virtual
     this->internalSave();
@@ -1001,7 +999,7 @@
     fDeviceCMDirty = true;
 
     SkIRect ir;
-    if (!this->clipRectBounds(bounds, flags, &ir, imgf)) {
+    if (!this->clipRectBounds(bounds, flags, &ir, paint ? paint->getImageFilter() : NULL)) {
         return;
     }
 
@@ -1015,7 +1013,7 @@
     SkPixelGeometry geo = fProps.pixelGeometry();
     if (paint) {
         // TODO: perhaps add a query to filters so we might preserve opaqueness...
-        if (imgf || paint->getColorFilter()) {
+        if (paint->getImageFilter() || paint->getColorFilter()) {
             isOpaque = false;
             geo = kUnknown_SkPixelGeometry;
         }
@@ -1031,10 +1029,7 @@
 
     bool forceSpriteOnRestore = false;
     {
-        SkBaseDevice::TileUsage usage = SkBaseDevice::kNever_TileUsage;
-        if (imgf && imgf->mayDrawWithMatrix()) {
-            usage = SkBaseDevice::kPossible_TileUsage;
-        }
+        const SkBaseDevice::TileUsage usage = SkBaseDevice::kNever_TileUsage;
         const SkBaseDevice::CreateInfo createInfo = SkBaseDevice::CreateInfo(info, usage, geo);
         SkBaseDevice* newDev = device->onCreateDevice(createInfo, paint);
         if (NULL == newDev) {