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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: fuzz/FilterFuzz.cpp

Issue 1869763002: Update LightingImageFilter to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address code review comments Created 4 years, 8 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 | « bench/LightingBench.cpp ('k') | gm/imagefiltersclipped.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 #include "Fuzz.h" 7 #include "Fuzz.h"
8 #include "Sk1DPathEffect.h" 8 #include "Sk1DPathEffect.h"
9 #include "Sk2DPathEffect.h" 9 #include "Sk2DPathEffect.h"
10 #include "SkAlphaThresholdFilter.h" 10 #include "SkAlphaThresholdFilter.h"
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 kernelOffset, 619 kernelOffset,
620 (SkMatrixConvolutionImageF ilter::TileMode)R(3), 620 (SkMatrixConvolutionImageF ilter::TileMode)R(3),
621 R(2) == 1, 621 R(2) == 1,
622 make_image_filter(), 622 make_image_filter(),
623 &cropR); 623 &cropR);
624 break; 624 break;
625 } 625 }
626 case COMPOSE: 626 case COMPOSE:
627 filter = SkComposeImageFilter::Make(make_image_filter(), make_image_filt er()); 627 filter = SkComposeImageFilter::Make(make_image_filter(), make_image_filt er());
628 break; 628 break;
629 case DISTANT_LIGHT: { 629 case DISTANT_LIGHT:
630 sk_sp<SkImageFilter> subFilter(make_image_filter());
631
632 filter = (R(2) == 1) 630 filter = (R(2) == 1)
633 ? sk_sp<SkImageFilter>(SkLightingImageFilter::CreateDistantLitD iffuse(make_point(), 631 ? SkLightingImageFilter::MakeDistantLitDiffuse(make_point(), ma ke_color(),
634 make_color(), make_scalar(), mak e_scalar(), 632 make_scalar(), m ake_scalar(),
635 subFilter.get())) 633 make_image_filte r())
636 : sk_sp<SkImageFilter>(SkLightingImageFilter::CreateDistantLitS pecular(make_point(), 634 : SkLightingImageFilter::MakeDistantLitSpecular(make_point(), m ake_color(),
637 make_color(), make_scalar(), 635 make_scalar(), make_scalar(),
638 make_scalar(), SkIntToScalar(R(1 0)), 636 SkIntToScalar(R (10)),
639 subFilter.get())); 637 make_image_filt er());
640 break; 638 break;
641 } 639 case POINT_LIGHT:
642 case POINT_LIGHT: {
643 sk_sp<SkImageFilter> subFilter(make_image_filter());
644
645 filter = (R(2) == 1) 640 filter = (R(2) == 1)
646 ? sk_sp<SkImageFilter>(SkLightingImageFilter::CreatePointLitDif fuse(make_point(), 641 ? SkLightingImageFilter::MakePointLitDiffuse(make_point(), make _color(),
647 make_color(), make_scalar(), mak e_scalar(), 642 make_scalar(), mak e_scalar(),
648 subFilter.get())) 643 make_image_filter( ))
649 : sk_sp<SkImageFilter>(SkLightingImageFilter::CreatePointLitSpe cular(make_point(), 644 : SkLightingImageFilter::MakePointLitSpecular(make_point(), mak e_color(),
650 make_color(), make_scalar(), mak e_scalar(), 645 make_scalar(), ma ke_scalar(),
651 SkIntToScalar(R(10)), 646 SkIntToScalar(R(1 0)),
652 subFilter.get())); 647 make_image_filter ());
653 break; 648 break;
654 } 649 case SPOT_LIGHT:
655 case SPOT_LIGHT: {
656 sk_sp<SkImageFilter> subFilter(make_image_filter());
657
658 filter = (R(2) == 1) 650 filter = (R(2) == 1)
659 ? sk_sp<SkImageFilter>(SkLightingImageFilter::CreateSpotLitDiff use(SkPoint3::Make(0, 0, 0), 651 ? SkLightingImageFilter::MakeSpotLitDiffuse(SkPoint3::Make(0, 0 , 0),
660 make_point(), make_scalar(), ma ke_scalar(), 652 make_point(), make_ scalar(),
661 make_color(), make_scalar(), ma ke_scalar(), 653 make_scalar(), make _color(),
662 subFilter.get())) 654 make_scalar(), make _scalar(),
663 : sk_sp<SkImageFilter>(SkLightingImageFilter::CreateSpotLitSpec ular(SkPoint3::Make(0, 0, 0), 655 make_image_filter() )
664 make_point(), make_scalar(), ma ke_scalar(), 656 : SkLightingImageFilter::MakeSpotLitSpecular(SkPoint3::Make(0, 0, 0),
665 make_color(), make_scalar(), ma ke_scalar(), 657 make_point(), make _scalar(),
666 SkIntToScalar(R(10)), subFilter .get())); 658 make_scalar(), mak e_color(),
659 make_scalar(), mak e_scalar(),
660 SkIntToScalar(R(10 )),
661 make_image_filter( ));
667 break; 662 break;
668 }
669 case NOISE: { 663 case NOISE: {
670 sk_sp<SkShader> shader((R(2) == 1) ? 664 sk_sp<SkShader> shader((R(2) == 1)
671 SkPerlinNoiseShader::MakeFractalNoise( 665 ? SkPerlinNoiseShader::MakeFractalNoise(make_scalar(true), make_ scalar(true),
672 make_scalar(true), make_scalar(true), R(10.0f), make_scalar()) : 666 R(10.0f), make_scalar())
673 SkPerlinNoiseShader::MakeTurbulence( 667 : SkPerlinNoiseShader::MakeTurbulence(make_scalar(true), make_sc alar(true),
674 make_scalar(true), make_scalar(true), R(10.0f), make_scalar())); 668 R(10.0f), make_scalar()));
675 SkPaint paint; 669 SkPaint paint;
676 paint.setShader(shader); 670 paint.setShader(shader);
677 SkImageFilter::CropRect cropR(SkRect::MakeWH(SkIntToScalar(kBitmapSize), 671 SkImageFilter::CropRect cropR(SkRect::MakeWH(SkIntToScalar(kBitmapSize),
678 SkIntToScalar(kBitmapSize)) ); 672 SkIntToScalar(kBitmapSize)) );
679 filter = SkPaintImageFilter::Make(paint, &cropR); 673 filter = SkPaintImageFilter::Make(paint, &cropR);
680 break; 674 break;
681 } 675 }
682 case DROP_SHADOW: 676 case DROP_SHADOW:
683 filter = SkDropShadowImageFilter::Make(make_scalar(), 677 filter = SkDropShadowImageFilter::Make(make_scalar(),
684 make_scalar(), 678 make_scalar(),
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 DEF_FUZZ(SerializedImageFilter, f) { 790 DEF_FUZZ(SerializedImageFilter, f) {
797 fuzz = f; 791 fuzz = f;
798 SkImageFilter* filter = make_serialized_image_filter(); 792 SkImageFilter* filter = make_serialized_image_filter();
799 793
800 SkPaint paint; 794 SkPaint paint;
801 SkSafeUnref(paint.setImageFilter(filter)); 795 SkSafeUnref(paint.setImageFilter(filter));
802 SkBitmap bitmap; 796 SkBitmap bitmap;
803 SkCanvas canvas(bitmap); 797 SkCanvas canvas(bitmap);
804 drawClippedBitmap(&canvas, 0, 0, paint); 798 drawClippedBitmap(&canvas, 0, 0, paint);
805 } 799 }
OLDNEW
« no previous file with comments | « bench/LightingBench.cpp ('k') | gm/imagefiltersclipped.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698