Fix for SkDisplacementMap::onFilterBounds().

tests/ImageFilterTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBicubicImageFilter.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
@@ skipping 291 matching lines @@
     SkAutoTUnref<SkImageFilter> gradient_source(SkBitmapSource::Create(make_gradient_circle(64, 64)));
 
     struct {
         const char*    fName;
         SkImageFilter* fFilter;
     } filters[] = {
         { "color filter", SkColorFilterImageFilter::Create(cf.get()) },
         { "displacement map", SkDisplacementMapEffect::Create(
               SkDisplacementMapEffect::kR_ChannelSelectorType,
               SkDisplacementMapEffect::kB_ChannelSelectorType,
-              40.0f, gradient_source.get()) },
+              20.0f, gradient_source.get()) },
         { "blur", SkBlurImageFilter::Create(SK_Scalar1, SK_Scalar1) },
         { "drop shadow", SkDropShadowImageFilter::Create(
               SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_ColorGREEN) },
         { "diffuse lighting", SkLightingImageFilter::CreatePointLitDiffuse(
               location, SK_ColorGREEN, 0, 0) },
         { "specular lighting",
               SkLightingImageFilter::CreatePointLitSpecular(location, SK_ColorGREEN, 0, 0, 0) },
         { "matrix convolution",
               SkMatrixConvolutionImageFilter::Create(
                   kernelSize, kernel, gain, bias, SkIPoint::Make(1, 1),
                   SkMatrixConvolutionImageFilter::kRepeat_TileMode, false) },
         { "merge", SkMergeImageFilter::Create(NULL, NULL, SkXfermode::kSrcOver_Mode) },
         { "offset", SkOffsetImageFilter::Create(SK_Scalar1, SK_Scalar1) },
         { "dilate", SkDilateImageFilter::Create(3, 2) },
         { "erode", SkErodeImageFilter::Create(2, 3) },
         { "tile", SkTileImageFilter::Create(SkRect::MakeXYWH(0, 0, 50, 50),
                                             SkRect::MakeXYWH(0, 0, 100, 100), NULL) },
     };
 
     SkBitmap untiledResult, tiledResult;
     int width = 64, height = 64;
     untiledResult.allocN32Pixels(width, height);
     tiledResult.allocN32Pixels(width, height);
     SkCanvas tiledCanvas(tiledResult);
     SkCanvas untiledCanvas(untiledResult);
-    tiledCanvas.clear(0);
-    untiledCanvas.clear(0);
-    int tileSize = 16;
+    int tileSize = 8;
 
-    for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
-        SkPaint paint;
-        paint.setImageFilter(filters[i].fFilter);
-        paint.setTextSize(SkIntToScalar(height));
-        paint.setColor(SK_ColorWHITE);
-        SkString str;
-        const char* text = "ABC";
-        SkScalar ypos = SkIntToScalar(height);
-        untiledCanvas.drawText(text, strlen(text), 0, ypos, paint);
-        for (int y = 0; y < height; y += tileSize) {
-            for (int x = 0; x < width; x += tileSize) {
-                tiledCanvas.save();
-                tiledCanvas.clipRect(SkRect::Make(SkIRect::MakeXYWH(x, y, tileSize, tileSize)));
-                tiledCanvas.drawText(text, strlen(text), 0, ypos, paint);
-                tiledCanvas.restore();
+    for (int scale = 1; scale <= 2; ++scale) {
+        for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
+            tiledCanvas.clear(0);
+            untiledCanvas.clear(0);
+            SkPaint paint;
+            paint.setImageFilter(filters[i].fFilter);
+            paint.setTextSize(SkIntToScalar(height));
+            paint.setColor(SK_ColorWHITE);
+            SkString str;
+            const char* text = "ABC";
+            SkScalar ypos = SkIntToScalar(height);
+            untiledCanvas.save();
+            untiledCanvas.scale(SkIntToScalar(scale), SkIntToScalar(scale));
+            untiledCanvas.drawText(text, strlen(text), 0, ypos, paint);
+            untiledCanvas.restore();
+            for (int y = 0; y < height; y += tileSize) {
+                for (int x = 0; x < width; x += tileSize) {
+                    tiledCanvas.save();
+                    tiledCanvas.clipRect(SkRect::Make(SkIRect::MakeXYWH(x, y, tileSize, tileSize)));
+                    tiledCanvas.scale(SkIntToScalar(scale), SkIntToScalar(scale));
+                    tiledCanvas.drawText(text, strlen(text), 0, ypos, paint);
+                    tiledCanvas.restore();
+                }
             }
-        }
-        untiledCanvas.flush();
-        tiledCanvas.flush();
-        for (int y = 0; y < height; y++) {
-            int diffs = memcmp(untiledResult.getAddr32(0, y), tiledResult.getAddr32(0, y), untiledResult.rowBytes());
-            REPORTER_ASSERT_MESSAGE(reporter, !diffs, filters[i].fName);
-            if (diffs) {
-                break;
+            untiledCanvas.flush();
+            tiledCanvas.flush();
+            for (int y = 0; y < height; y++) {
+                int diffs = memcmp(untiledResult.getAddr32(0, y), tiledResult.getAddr32(0, y), untiledResult.rowBytes());
+                REPORTER_ASSERT_MESSAGE(reporter, !diffs, filters[i].fName);
+                if (diffs) {
+                    break;
+                }
             }
         }
     }
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
         SkSafeUnref(filters[i].fFilter);
     }
 }
 
 DEF_TEST(ImageFilterMatrixConvolution, reporter) {
@@ skipping 290 matching lines @@
 }
 
 DEF_GPUTEST(XfermodeImageFilterCroppedInputGPU, reporter, factory) {
     GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
                                                          SkImageInfo::MakeN32Premul(1, 1),
                                                          0));
     test_xfermode_cropped_input(device, reporter);
 }
 #endif