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

Side by Side Diff: tests/ImageFilterTest.cpp

Issue 1014533004: SkPaint::FilterLevel -> SkFilterQuality (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 9 months 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 | « tests/DrawBitmapRectTest.cpp ('k') | tests/PaintTest.cpp » ('j') | 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"
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 { "matrix convolution", 463 { "matrix convolution",
464 SkMatrixConvolutionImageFilter::Create( 464 SkMatrixConvolutionImageFilter::Create(
465 kernelSize, kernel, gain, bias, SkIPoint::Make(1, 1), 465 kernelSize, kernel, gain, bias, SkIPoint::Make(1, 1),
466 SkMatrixConvolutionImageFilter::kRepeat_TileMode, false) }, 466 SkMatrixConvolutionImageFilter::kRepeat_TileMode, false) },
467 { "merge", SkMergeImageFilter::Create(NULL, NULL, SkXfermode::kSrcOver_M ode) }, 467 { "merge", SkMergeImageFilter::Create(NULL, NULL, SkXfermode::kSrcOver_M ode) },
468 { "offset", SkOffsetImageFilter::Create(SK_Scalar1, SK_Scalar1) }, 468 { "offset", SkOffsetImageFilter::Create(SK_Scalar1, SK_Scalar1) },
469 { "dilate", SkDilateImageFilter::Create(3, 2) }, 469 { "dilate", SkDilateImageFilter::Create(3, 2) },
470 { "erode", SkErodeImageFilter::Create(2, 3) }, 470 { "erode", SkErodeImageFilter::Create(2, 3) },
471 { "tile", SkTileImageFilter::Create(SkRect::MakeXYWH(0, 0, 50, 50), 471 { "tile", SkTileImageFilter::Create(SkRect::MakeXYWH(0, 0, 50, 50),
472 SkRect::MakeXYWH(0, 0, 100, 100), NU LL) }, 472 SkRect::MakeXYWH(0, 0, 100, 100), NU LL) },
473 { "matrix", SkMatrixImageFilter::Create(matrix, SkPaint::kLow_FilterLeve l) }, 473 { "matrix", SkMatrixImageFilter::Create(matrix, kLow_SkFilterQuality) },
474 { "blur and offset", SkOffsetImageFilter::Create(five, five, blur.get()) }, 474 { "blur and offset", SkOffsetImageFilter::Create(five, five, blur.get()) },
475 { "picture and blur", SkBlurImageFilter::Create(five, five, pictureFilte r.get()) }, 475 { "picture and blur", SkBlurImageFilter::Create(five, five, pictureFilte r.get()) },
476 { "rect shader and blur", SkBlurImageFilter::Create(five, five, rectShad erFilter.get()) }, 476 { "rect shader and blur", SkBlurImageFilter::Create(five, five, rectShad erFilter.get()) },
477 }; 477 };
478 478
479 SkBitmap untiledResult, tiledResult; 479 SkBitmap untiledResult, tiledResult;
480 int width = 64, height = 64; 480 int width = 64, height = 64;
481 untiledResult.allocN32Pixels(width, height); 481 untiledResult.allocN32Pixels(width, height);
482 tiledResult.allocN32Pixels(width, height); 482 tiledResult.allocN32Pixels(width, height);
483 SkCanvas tiledCanvas(tiledResult); 483 SkCanvas tiledCanvas(tiledResult);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 } 526 }
527 527
528 static void draw_saveLayer_picture(int width, int height, int tileSize, 528 static void draw_saveLayer_picture(int width, int height, int tileSize,
529 SkBBHFactory* factory, SkBitmap* result) { 529 SkBBHFactory* factory, SkBitmap* result) {
530 530
531 SkMatrix matrix; 531 SkMatrix matrix;
532 matrix.setTranslate(SkIntToScalar(50), 0); 532 matrix.setTranslate(SkIntToScalar(50), 0);
533 533
534 SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(SK_ColorWHITE , SkXfermode::kSrc_Mode)); 534 SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(SK_ColorWHITE , SkXfermode::kSrc_Mode));
535 SkAutoTUnref<SkImageFilter> cfif(SkColorFilterImageFilter::Create(cf.get())) ; 535 SkAutoTUnref<SkImageFilter> cfif(SkColorFilterImageFilter::Create(cf.get())) ;
536 SkAutoTUnref<SkImageFilter> imageFilter(SkMatrixImageFilter::Create(matrix, SkPaint::kNone_FilterLevel, cfif.get())); 536 SkAutoTUnref<SkImageFilter> imageFilter(SkMatrixImageFilter::Create(matrix, kNone_SkFilterQuality, cfif.get()));
537 537
538 SkPaint paint; 538 SkPaint paint;
539 paint.setImageFilter(imageFilter.get()); 539 paint.setImageFilter(imageFilter.get());
540 SkPictureRecorder recorder; 540 SkPictureRecorder recorder;
541 SkRect bounds = SkRect::Make(SkIRect::MakeXYWH(0, 0, 50, 50)); 541 SkRect bounds = SkRect::Make(SkIRect::MakeXYWH(0, 0, 50, 50));
542 SkCanvas* recordingCanvas = recorder.beginRecording(SkIntToScalar(width), 542 SkCanvas* recordingCanvas = recorder.beginRecording(SkIntToScalar(width),
543 SkIntToScalar(height), 543 SkIntToScalar(height),
544 factory, 0); 544 factory, 0);
545 recordingCanvas->translate(-55, 0); 545 recordingCanvas->translate(-55, 0);
546 recordingCanvas->saveLayer(&bounds, &paint); 546 recordingCanvas->saveLayer(&bounds, &paint);
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1069 canvas.clear(0x0); 1069 canvas.clear(0x0);
1070 1070
1071 SkBitmap bitmap; 1071 SkBitmap bitmap;
1072 bitmap.allocN32Pixels(10, 10); 1072 bitmap.allocN32Pixels(10, 10);
1073 bitmap.eraseColor(SK_ColorGREEN); 1073 bitmap.eraseColor(SK_ColorGREEN);
1074 1074
1075 SkMatrix matrix; 1075 SkMatrix matrix;
1076 matrix.setScale(SkIntToScalar(2), SkIntToScalar(2)); 1076 matrix.setScale(SkIntToScalar(2), SkIntToScalar(2));
1077 matrix.postTranslate(SkIntToScalar(-20), SkIntToScalar(-20)); 1077 matrix.postTranslate(SkIntToScalar(-20), SkIntToScalar(-20));
1078 SkAutoTUnref<SkImageFilter> matrixFilter( 1078 SkAutoTUnref<SkImageFilter> matrixFilter(
1079 SkMatrixImageFilter::Create(matrix, SkPaint::kLow_FilterLevel)); 1079 SkMatrixImageFilter::Create(matrix, kLow_SkFilterQuality));
1080 1080
1081 // Test that saveLayer() with a filter nested inside another saveLayer() app lies the 1081 // Test that saveLayer() with a filter nested inside another saveLayer() app lies the
1082 // correct offset to the filter matrix. 1082 // correct offset to the filter matrix.
1083 SkRect bounds1 = SkRect::MakeXYWH(10, 10, 30, 30); 1083 SkRect bounds1 = SkRect::MakeXYWH(10, 10, 30, 30);
1084 canvas.saveLayer(&bounds1, NULL); 1084 canvas.saveLayer(&bounds1, NULL);
1085 SkPaint filterPaint; 1085 SkPaint filterPaint;
1086 filterPaint.setImageFilter(matrixFilter); 1086 filterPaint.setImageFilter(matrixFilter);
1087 SkRect bounds2 = SkRect::MakeXYWH(20, 20, 10, 10); 1087 SkRect bounds2 = SkRect::MakeXYWH(20, 20, 10, 10);
1088 canvas.saveLayer(&bounds2, &filterPaint); 1088 canvas.saveLayer(&bounds2, &filterPaint);
1089 SkPaint greenPaint; 1089 SkPaint greenPaint;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 DEF_GPUTEST(TestNegativeBlurSigmaGPU, reporter, factory) { 1173 DEF_GPUTEST(TestNegativeBlurSigmaGPU, reporter, factory) {
1174 GrContext* context = factory->get(static_cast<GrContextFactory::GLContextTyp e>(0)); 1174 GrContext* context = factory->get(static_cast<GrContextFactory::GLContextTyp e>(0));
1175 SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context, 1175 SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
1176 SkSurface::kNo_Budgeted , 1176 SkSurface::kNo_Budgeted ,
1177 SkImageInfo::MakeN32Pre mul(1, 1), 1177 SkImageInfo::MakeN32Pre mul(1, 1),
1178 0, 1178 0,
1179 &gProps)); 1179 &gProps));
1180 test_negative_blur_sigma(device, reporter); 1180 test_negative_blur_sigma(device, reporter);
1181 } 1181 }
1182 #endif 1182 #endif
OLDNEW
« no previous file with comments | « tests/DrawBitmapRectTest.cpp ('k') | tests/PaintTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698