Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: tests/ImageFilterTest.cpp

Issue 678273002: Revert of Fix bounds computation of all 0-input filters. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/effects/SkPictureImageFilter.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkBitmap.h" 8 #include "SkBitmap.h"
9 #include "SkBitmapDevice.h" 9 #include "SkBitmapDevice.h"
10 #include "SkBitmapSource.h" 10 #include "SkBitmapSource.h"
11 #include "SkBlurImageFilter.h" 11 #include "SkBlurImageFilter.h"
12 #include "SkCanvas.h" 12 #include "SkCanvas.h"
13 #include "SkColorFilterImageFilter.h" 13 #include "SkColorFilterImageFilter.h"
14 #include "SkColorMatrixFilter.h" 14 #include "SkColorMatrixFilter.h"
15 #include "SkDeviceImageFilterProxy.h" 15 #include "SkDeviceImageFilterProxy.h"
16 #include "SkDisplacementMapEffect.h" 16 #include "SkDisplacementMapEffect.h"
17 #include "SkDropShadowImageFilter.h" 17 #include "SkDropShadowImageFilter.h"
18 #include "SkFlattenableSerialization.h" 18 #include "SkFlattenableSerialization.h"
19 #include "SkGradientShader.h" 19 #include "SkGradientShader.h"
20 #include "SkLightingImageFilter.h" 20 #include "SkLightingImageFilter.h"
21 #include "SkMatrixConvolutionImageFilter.h" 21 #include "SkMatrixConvolutionImageFilter.h"
22 #include "SkMatrixImageFilter.h" 22 #include "SkMatrixImageFilter.h"
23 #include "SkMergeImageFilter.h" 23 #include "SkMergeImageFilter.h"
24 #include "SkMorphologyImageFilter.h" 24 #include "SkMorphologyImageFilter.h"
25 #include "SkOffsetImageFilter.h" 25 #include "SkOffsetImageFilter.h"
26 #include "SkPerlinNoiseShader.h"
27 #include "SkPicture.h" 26 #include "SkPicture.h"
28 #include "SkPictureImageFilter.h" 27 #include "SkPictureImageFilter.h"
29 #include "SkPictureRecorder.h" 28 #include "SkPictureRecorder.h"
30 #include "SkReadBuffer.h" 29 #include "SkReadBuffer.h"
31 #include "SkRect.h" 30 #include "SkRect.h"
32 #include "SkRectShaderImageFilter.h"
33 #include "SkTileImageFilter.h" 31 #include "SkTileImageFilter.h"
34 #include "SkXfermodeImageFilter.h" 32 #include "SkXfermodeImageFilter.h"
35 #include "Test.h" 33 #include "Test.h"
36 34
37 #if SK_SUPPORT_GPU 35 #if SK_SUPPORT_GPU
38 #include "GrContextFactory.h" 36 #include "GrContextFactory.h"
39 #include "SkGpuDevice.h" 37 #include "SkGpuDevice.h"
40 #endif 38 #endif
41 39
42 static const int kBitmapSize = 4; 40 static const int kBitmapSize = 4;
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 392
395 SkRTreeFactory factory; 393 SkRTreeFactory factory;
396 SkPictureRecorder recorder; 394 SkPictureRecorder recorder;
397 SkCanvas* recordingCanvas = recorder.beginRecording(64, 64, &factory, 0); 395 SkCanvas* recordingCanvas = recorder.beginRecording(64, 64, &factory, 0);
398 396
399 SkPaint greenPaint; 397 SkPaint greenPaint;
400 greenPaint.setColor(SK_ColorGREEN); 398 greenPaint.setColor(SK_ColorGREEN);
401 recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 30, 20)), g reenPaint); 399 recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 30, 20)), g reenPaint);
402 SkAutoTUnref<SkPicture> picture(recorder.endRecording()); 400 SkAutoTUnref<SkPicture> picture(recorder.endRecording());
403 SkAutoTUnref<SkImageFilter> pictureFilter(SkPictureImageFilter::Create(pictu re.get())); 401 SkAutoTUnref<SkImageFilter> pictureFilter(SkPictureImageFilter::Create(pictu re.get()));
404 SkAutoTUnref<SkShader> shader(SkPerlinNoiseShader::CreateTurbulence(SK_Scala r1, SK_Scalar1, 1, 0));
405
406 SkAutoTUnref<SkImageFilter> rectShaderFilter(SkRectShaderImageFilter::Create (shader.get()));
407 402
408 struct { 403 struct {
409 const char* fName; 404 const char* fName;
410 SkImageFilter* fFilter; 405 SkImageFilter* fFilter;
411 } filters[] = { 406 } filters[] = {
412 { "color filter", SkColorFilterImageFilter::Create(cf.get()) }, 407 { "color filter", SkColorFilterImageFilter::Create(cf.get()) },
413 { "displacement map", SkDisplacementMapEffect::Create( 408 { "displacement map", SkDisplacementMapEffect::Create(
414 SkDisplacementMapEffect::kR_ChannelSelectorType, 409 SkDisplacementMapEffect::kR_ChannelSelectorType,
415 SkDisplacementMapEffect::kB_ChannelSelectorType, 410 SkDisplacementMapEffect::kB_ChannelSelectorType,
416 20.0f, gradient_source.get()) }, 411 20.0f, gradient_source.get()) },
(...skipping 11 matching lines...) Expand all
428 SkMatrixConvolutionImageFilter::kRepeat_TileMode, false) }, 423 SkMatrixConvolutionImageFilter::kRepeat_TileMode, false) },
429 { "merge", SkMergeImageFilter::Create(NULL, NULL, SkXfermode::kSrcOver_M ode) }, 424 { "merge", SkMergeImageFilter::Create(NULL, NULL, SkXfermode::kSrcOver_M ode) },
430 { "offset", SkOffsetImageFilter::Create(SK_Scalar1, SK_Scalar1) }, 425 { "offset", SkOffsetImageFilter::Create(SK_Scalar1, SK_Scalar1) },
431 { "dilate", SkDilateImageFilter::Create(3, 2) }, 426 { "dilate", SkDilateImageFilter::Create(3, 2) },
432 { "erode", SkErodeImageFilter::Create(2, 3) }, 427 { "erode", SkErodeImageFilter::Create(2, 3) },
433 { "tile", SkTileImageFilter::Create(SkRect::MakeXYWH(0, 0, 50, 50), 428 { "tile", SkTileImageFilter::Create(SkRect::MakeXYWH(0, 0, 50, 50),
434 SkRect::MakeXYWH(0, 0, 100, 100), NU LL) }, 429 SkRect::MakeXYWH(0, 0, 100, 100), NU LL) },
435 { "matrix", SkMatrixImageFilter::Create(matrix, SkPaint::kLow_FilterLeve l) }, 430 { "matrix", SkMatrixImageFilter::Create(matrix, SkPaint::kLow_FilterLeve l) },
436 { "blur and offset", SkOffsetImageFilter::Create(five, five, blur.get()) }, 431 { "blur and offset", SkOffsetImageFilter::Create(five, five, blur.get()) },
437 { "picture and blur", SkBlurImageFilter::Create(five, five, pictureFilte r.get()) }, 432 { "picture and blur", SkBlurImageFilter::Create(five, five, pictureFilte r.get()) },
438 { "rect shader and blur", SkBlurImageFilter::Create(five, five, rectShad erFilter.get()) },
439 }; 433 };
440 434
441 SkBitmap untiledResult, tiledResult; 435 SkBitmap untiledResult, tiledResult;
442 int width = 64, height = 64; 436 int width = 64, height = 64;
443 untiledResult.allocN32Pixels(width, height); 437 untiledResult.allocN32Pixels(width, height);
444 tiledResult.allocN32Pixels(width, height); 438 tiledResult.allocN32Pixels(width, height);
445 SkCanvas tiledCanvas(tiledResult); 439 SkCanvas tiledCanvas(tiledResult);
446 SkCanvas untiledCanvas(untiledResult); 440 SkCanvas untiledCanvas(untiledResult);
447 int tileSize = 8; 441 int tileSize = 8;
448 442
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 1089
1096 DEF_GPUTEST(TestNegativeBlurSigmaGPU, reporter, factory) { 1090 DEF_GPUTEST(TestNegativeBlurSigmaGPU, reporter, factory) {
1097 GrContext* context = factory->get(static_cast<GrContextFactory::GLContextTyp e>(0)); 1091 GrContext* context = factory->get(static_cast<GrContextFactory::GLContextTyp e>(0));
1098 SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context, 1092 SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
1099 SkImageInfo::MakeN32Pre mul(1, 1), 1093 SkImageInfo::MakeN32Pre mul(1, 1),
1100 gProps, 1094 gProps,
1101 0)); 1095 0));
1102 test_negative_blur_sigma(device, reporter); 1096 test_negative_blur_sigma(device, reporter);
1103 } 1097 }
1104 #endif 1098 #endif
OLDNEW
« no previous file with comments | « src/effects/SkPictureImageFilter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698