Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "SkDropShadowImageFilter.h" | 8 #include "SkDropShadowImageFilter.h" |
| 9 | 9 |
| 10 #include "SkBitmap.h" | 10 #include "SkBitmap.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 if (nullptr == device.get()) { | 72 if (nullptr == device.get()) { |
| 73 return false; | 73 return false; |
| 74 } | 74 } |
| 75 SkCanvas canvas(device.get()); | 75 SkCanvas canvas(device.get()); |
| 76 | 76 |
| 77 SkVector sigma = SkVector::Make(fSigmaX, fSigmaY); | 77 SkVector sigma = SkVector::Make(fSigmaX, fSigmaY); |
| 78 ctx.ctm().mapVectors(&sigma, 1); | 78 ctx.ctm().mapVectors(&sigma, 1); |
| 79 sigma.fX = SkMaxScalar(0, sigma.fX); | 79 sigma.fX = SkMaxScalar(0, sigma.fX); |
| 80 sigma.fY = SkMaxScalar(0, sigma.fY); | 80 sigma.fY = SkMaxScalar(0, sigma.fY); |
| 81 SkAutoTUnref<SkImageFilter> blurFilter(SkBlurImageFilter::Create(sigma.fX, s igma.fY)); | 81 SkAutoTUnref<SkImageFilter> blurFilter(SkBlurImageFilter::Create(sigma.fX, s igma.fY)); |
| 82 SkAutoTUnref<SkColorFilter> colorFilter( | 82 auto colorFilter(SkColorFilter::MakeModeFilter(fColor, SkXfermode::kSrcIn_Mo de)); |
| 83 SkColorFilter::CreateModeFilter(fColor, SkXfermode::kSrcIn_Mode)); | |
| 84 SkPaint paint; | 83 SkPaint paint; |
| 85 paint.setImageFilter(blurFilter.get()); | 84 paint.setImageFilter(blurFilter.get()); |
| 86 paint.setColorFilter(colorFilter.get()); | 85 paint.setColorFilter(colorFilter); |
|
f(malita)
2016/03/21 22:24:19
std::move colorFilter (or inline factory).
reed1
2016/03/22 13:47:10
Done.
| |
| 87 paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); | 86 paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); |
| 88 SkVector offsetVec = SkVector::Make(fDx, fDy); | 87 SkVector offsetVec = SkVector::Make(fDx, fDy); |
| 89 ctx.ctm().mapVectors(&offsetVec, 1); | 88 ctx.ctm().mapVectors(&offsetVec, 1); |
| 90 canvas.translate(SkIntToScalar(srcOffset.fX - bounds.fLeft), | 89 canvas.translate(SkIntToScalar(srcOffset.fX - bounds.fLeft), |
| 91 SkIntToScalar(srcOffset.fY - bounds.fTop)); | 90 SkIntToScalar(srcOffset.fY - bounds.fTop)); |
| 92 canvas.drawBitmap(src, offsetVec.fX, offsetVec.fY, &paint); | 91 canvas.drawBitmap(src, offsetVec.fX, offsetVec.fY, &paint); |
| 93 if (fShadowMode == kDrawShadowAndForeground_ShadowMode) { | 92 if (fShadowMode == kDrawShadowAndForeground_ShadowMode) { |
| 94 canvas.drawBitmap(src, 0, 0); | 93 canvas.drawBitmap(src, 0, 0); |
| 95 } | 94 } |
| 96 *result = device->accessBitmap(false); | 95 *result = device->accessBitmap(false); |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 152 "kDrawShadowAndForeground", "kDrawShadowOnly" | 151 "kDrawShadowAndForeground", "kDrawShadowOnly" |
| 153 }; | 152 }; |
| 154 | 153 |
| 155 static_assert(kShadowModeCount == SK_ARRAY_COUNT(gModeStrings), "enum_mismat ch"); | 154 static_assert(kShadowModeCount == SK_ARRAY_COUNT(gModeStrings), "enum_mismat ch"); |
| 156 | 155 |
| 157 str->appendf(" mode: %s", gModeStrings[fShadowMode]); | 156 str->appendf(" mode: %s", gModeStrings[fShadowMode]); |
| 158 | 157 |
| 159 str->append(")"); | 158 str->append(")"); |
| 160 } | 159 } |
| 161 #endif | 160 #endif |
| OLD | NEW |