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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: samplecode/SampleFilterFuzz.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 | « include/effects/SkLightingImageFilter.h ('k') | src/effects/SkLightingImageFilter.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 "SampleCode.h" 7 #include "SampleCode.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 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 kernelOffset, 622 kernelOffset,
623 (SkMatrixConvolutionImageF ilter::TileMode)R(3), 623 (SkMatrixConvolutionImageF ilter::TileMode)R(3),
624 R(2) == 1, 624 R(2) == 1,
625 make_image_filter(), 625 make_image_filter(),
626 &cropR); 626 &cropR);
627 break; 627 break;
628 } 628 }
629 case COMPOSE: 629 case COMPOSE:
630 filter = SkComposeImageFilter::Make(make_image_filter(), make_image_filt er()); 630 filter = SkComposeImageFilter::Make(make_image_filter(), make_image_filt er());
631 break; 631 break;
632 case DISTANT_LIGHT: { 632 case DISTANT_LIGHT:
633 sk_sp<SkImageFilter> subFilter(make_image_filter());
634
635 filter = (R(2) == 1) 633 filter = (R(2) == 1)
636 ? sk_sp<SkImageFilter>(SkLightingImageFilter::CreateDistantLitD iffuse(make_point(), 634 ? SkLightingImageFilter::MakeDistantLitDiffuse(make_point(), ma ke_color(),
637 make_color(), make_scalar(), mak e_scalar(), 635 make_scalar(), m ake_scalar(),
638 subFilter.get())) 636 make_image_filte r())
639 : sk_sp<SkImageFilter>(SkLightingImageFilter::CreateDistantLitS pecular(make_point(), 637 : SkLightingImageFilter::MakeDistantLitSpecular(make_point(), m ake_color(),
640 make_color(), make_scalar(), 638 make_scalar(), make_scalar(),
641 make_scalar(), SkIntToScalar(R(1 0)), 639 SkIntToScalar(R (10)),
642 subFilter.get())); 640 make_image_filt er());
643 break; 641 break;
644 } 642 case POINT_LIGHT:
645 case POINT_LIGHT: {
646 sk_sp<SkImageFilter> subFilter(make_image_filter());
647
648 filter = (R(2) == 1) 643 filter = (R(2) == 1)
649 ? sk_sp<SkImageFilter>(SkLightingImageFilter::CreatePointLitDif fuse(make_point(), 644 ? SkLightingImageFilter::MakePointLitDiffuse(make_point(), make _color(),
650 make_color(), make_scalar(), mak e_scalar(), 645 make_scalar(), mak e_scalar(),
651 subFilter.get())) 646 make_image_filter( ))
652 : sk_sp<SkImageFilter>(SkLightingImageFilter::CreatePointLitSpe cular(make_point(), 647 : SkLightingImageFilter::MakePointLitSpecular(make_point(), mak e_color(),
653 make_color(), make_scalar(), mak e_scalar(), 648 make_scalar(), ma ke_scalar(),
654 SkIntToScalar(R(10)), 649 SkIntToScalar(R(1 0)),
655 subFilter.get())); 650 make_image_filter ());
656 break; 651 break;
657 } 652 case SPOT_LIGHT:
658 case SPOT_LIGHT: {
659 sk_sp<SkImageFilter> subFilter(make_image_filter());
660
661 filter = (R(2) == 1) 653 filter = (R(2) == 1)
662 ? sk_sp<SkImageFilter>(SkLightingImageFilter::CreateSpotLitDiff use(SkPoint3::Make(0, 0, 0), 654 ? SkLightingImageFilter::MakeSpotLitDiffuse(SkPoint3::Make(0, 0 , 0),
663 make_point(), make_scalar(), ma ke_scalar(), 655 make_point(), make_ scalar(),
664 make_color(), make_scalar(), ma ke_scalar(), 656 make_scalar(), make _color(),
665 subFilter.get())) 657 make_scalar(), make _scalar(),
666 : sk_sp<SkImageFilter>(SkLightingImageFilter::CreateSpotLitSpec ular(SkPoint3::Make(0, 0, 0), 658 make_image_filter() )
667 make_point(), make_scalar(), ma ke_scalar(), 659 : SkLightingImageFilter::MakeSpotLitSpecular(SkPoint3::Make(0, 0, 0),
668 make_color(), make_scalar(), ma ke_scalar(), 660 make_point(), make _scalar(),
669 SkIntToScalar(R(10)), subFilter .get())); 661 make_scalar(), mak e_color(),
662 make_scalar(), mak e_scalar(),
663 SkIntToScalar(R(10 )),
664 make_image_filter( ));
670 break; 665 break;
671 }
672 case NOISE: { 666 case NOISE: {
673 sk_sp<SkShader> shader((R(2) == 1) ? 667 sk_sp<SkShader> shader((R(2) == 1)
674 SkPerlinNoiseShader::MakeFractalNoise( 668 ? SkPerlinNoiseShader::MakeFractalNoise(make_scalar(true), make_ scalar(true),
675 make_scalar(true), make_scalar(true), R(10.0f), make_scalar()) : 669 R(10.0f), make_scalar())
676 SkPerlinNoiseShader::MakeTurbulence( 670 : SkPerlinNoiseShader::MakeTurbulence(make_scalar(true), make_sc alar(true),
677 make_scalar(true), make_scalar(true), R(10.0f), make_scalar())); 671 R(10.0f), make_scalar()));
678 SkPaint paint; 672 SkPaint paint;
679 paint.setShader(shader); 673 paint.setShader(shader);
680 SkImageFilter::CropRect cropR(SkRect::MakeWH(SkIntToScalar(kBitmapSize), 674 SkImageFilter::CropRect cropR(SkRect::MakeWH(SkIntToScalar(kBitmapSize),
681 SkIntToScalar(kBitmapSize)) ); 675 SkIntToScalar(kBitmapSize)) );
682 filter = SkPaintImageFilter::Make(paint, &cropR); 676 filter = SkPaintImageFilter::Make(paint, &cropR);
683 break; 677 break;
684 } 678 }
685 case DROP_SHADOW: 679 case DROP_SHADOW:
686 filter = SkDropShadowImageFilter::Make(make_scalar(), 680 filter = SkDropShadowImageFilter::Make(make_scalar(),
687 make_scalar(), 681 make_scalar(),
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 } 840 }
847 841
848 private: 842 private:
849 typedef SkView INHERITED; 843 typedef SkView INHERITED;
850 }; 844 };
851 845
852 ////////////////////////////////////////////////////////////////////////////// 846 //////////////////////////////////////////////////////////////////////////////
853 847
854 static SkView* MyFactory() { return new ImageFilterFuzzView; } 848 static SkView* MyFactory() { return new ImageFilterFuzzView; }
855 static SkViewRegister reg(MyFactory); 849 static SkViewRegister reg(MyFactory);
OLDNEW
« no previous file with comments | « include/effects/SkLightingImageFilter.h ('k') | src/effects/SkLightingImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698