| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2014 Google Inc. | 2  * Copyright 2014 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 "gm.h" | 8 #include "gm.h" | 
| 9 #include "SkBlurMaskFilter.h" | 9 #include "SkBlurMaskFilter.h" | 
| 10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
| 36     SkISize onISize() override { | 36     SkISize onISize() override { | 
| 37         return SkISize::Make(600, 120); | 37         return SkISize::Make(600, 120); | 
| 38     } | 38     } | 
| 39 | 39 | 
| 40     void onDraw(SkCanvas* canvas) override { | 40     void onDraw(SkCanvas* canvas) override { | 
| 41         SkPaint paint; | 41         SkPaint paint; | 
| 42         SkBitmap bm = make_bm(); | 42         SkBitmap bm = make_bm(); | 
| 43         canvas->drawBitmap(bm, 10, 10, &paint); | 43         canvas->drawBitmap(bm, 10, 10, &paint); | 
| 44 | 44 | 
| 45         const SkScalar dir[] = { 1, 1, 1 }; | 45         const SkScalar dir[] = { 1, 1, 1 }; | 
| 46         paint.setMaskFilter(SkBlurMaskFilter::CreateEmboss(3, dir, 0.3f, 0.1f))-
    >unref(); | 46         paint.setMaskFilter(SkBlurMaskFilter::MakeEmboss(3, dir, 0.3f, 0.1f)); | 
| 47         canvas->translate(bm.width() + SkIntToScalar(10), 0); | 47         canvas->translate(bm.width() + SkIntToScalar(10), 0); | 
| 48         canvas->drawBitmap(bm, 10, 10, &paint); | 48         canvas->drawBitmap(bm, 10, 10, &paint); | 
| 49 | 49 | 
| 50         // this combination of emboss+colorfilter used to crash -- so we exercis
    e it to | 50         // this combination of emboss+colorfilter used to crash -- so we exercis
    e it to | 
| 51         // confirm that we have a fix. | 51         // confirm that we have a fix. | 
| 52         paint.setColorFilter(SkColorFilter::MakeModeFilter(0xFFFF0000, SkXfermod
    e::kSrcATop_Mode)); | 52         paint.setColorFilter(SkColorFilter::MakeModeFilter(0xFFFF0000, SkXfermod
    e::kSrcATop_Mode)); | 
| 53         canvas->translate(bm.width() + SkIntToScalar(10), 0); | 53         canvas->translate(bm.width() + SkIntToScalar(10), 0); | 
| 54         canvas->drawBitmap(bm, 10, 10, &paint); | 54         canvas->drawBitmap(bm, 10, 10, &paint); | 
| 55     } | 55     } | 
| 56 | 56 | 
| 57 private: | 57 private: | 
| 58     typedef skiagm::GM INHERITED; | 58     typedef skiagm::GM INHERITED; | 
| 59 }; | 59 }; | 
| 60 | 60 | 
| 61 DEF_GM(return new EmbossGM;) | 61 DEF_GM(return new EmbossGM;) | 
| OLD | NEW | 
|---|