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

Side by Side Diff: Source/platform/graphics/DrawLooperBuilder.cpp

Issue 177473003: Use SkLayerDrawLooper::Builder to construct SkLayerDrawLooper. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove DrawLooper. Created 6 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "platform/graphics/DrawLooper.h" 32 #include "platform/graphics/DrawLooperBuilder.h"
33 33
34 #include "platform/geometry/FloatSize.h" 34 #include "platform/geometry/FloatSize.h"
35 #include "platform/graphics/Color.h" 35 #include "platform/graphics/Color.h"
36 #include "third_party/skia/include/core/SkColor.h" 36 #include "third_party/skia/include/core/SkColor.h"
37 #include "third_party/skia/include/core/SkColorFilter.h" 37 #include "third_party/skia/include/core/SkColorFilter.h"
38 #include "third_party/skia/include/core/SkDrawLooper.h" 38 #include "third_party/skia/include/core/SkDrawLooper.h"
39 #include "third_party/skia/include/core/SkPaint.h" 39 #include "third_party/skia/include/core/SkPaint.h"
40 #include "third_party/skia/include/core/SkXfermode.h" 40 #include "third_party/skia/include/core/SkXfermode.h"
41 #include "third_party/skia/include/effects/SkBlurMaskFilter.h" 41 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
42 #include "third_party/skia/include/effects/SkLayerDrawLooper.h" 42 #include "wtf/RefPtr.h"
43 43
44 namespace WebCore { 44 namespace WebCore {
45 45
46 DrawLooper::DrawLooper() : m_skDrawLooper(adoptRef(new SkLayerDrawLooper)) { } 46 DrawLooperBuilder::DrawLooperBuilder() { }
47 47
48 DrawLooper::~DrawLooper() { } 48 DrawLooperBuilder::~DrawLooperBuilder() { }
49 49
50 SkDrawLooper* DrawLooper::skDrawLooper() const 50 PassRefPtr<SkDrawLooper> DrawLooperBuilder::detachDrawLooper()
51 { 51 {
52 return m_skDrawLooper.get(); 52 return adoptRef(m_skDrawLooperBuilder.detachLooper());
53 } 53 }
54 54
55 void DrawLooper::addUnmodifiedContent() 55 void DrawLooperBuilder::addUnmodifiedContent()
56 { 56 {
57 SkLayerDrawLooper::LayerInfo info; 57 SkLayerDrawLooper::LayerInfo info;
58 m_skDrawLooper->addLayerOnTop(info); 58 m_skDrawLooperBuilder.addLayerOnTop(info);
59 } 59 }
60 60
61 void DrawLooper::addShadow(const FloatSize& offset, float blur, const Color& col or, 61 void DrawLooperBuilder::addShadow(const FloatSize& offset, float blur, const Col or& color,
62 ShadowTransformMode shadowTransformMode, ShadowAlphaMode shadowAlphaMode) 62 ShadowTransformMode shadowTransformMode, ShadowAlphaMode shadowAlphaMode)
63 { 63 {
64 // Detect when there's no effective shadow. 64 // Detect when there's no effective shadow.
65 if (!color.alpha()) 65 if (!color.alpha())
66 return; 66 return;
67 67
68 SkColor skColor = color.rgb(); 68 SkColor skColor = color.rgb();
69 69
70 SkLayerDrawLooper::LayerInfo info; 70 SkLayerDrawLooper::LayerInfo info;
71 71
72 switch (shadowAlphaMode) { 72 switch (shadowAlphaMode) {
73 case ShadowRespectsAlpha: 73 case ShadowRespectsAlpha:
74 info.fColorMode = SkXfermode::kDst_Mode; 74 info.fColorMode = SkXfermode::kDst_Mode;
75 break; 75 break;
76 case ShadowIgnoresAlpha: 76 case ShadowIgnoresAlpha:
77 info.fColorMode = SkXfermode::kSrc_Mode; 77 info.fColorMode = SkXfermode::kSrc_Mode;
78 break; 78 break;
79 default: 79 default:
80 ASSERT_NOT_REACHED(); 80 ASSERT_NOT_REACHED();
81 } 81 }
82 82
83 if (blur) 83 if (blur)
84 info.fPaintBits |= SkLayerDrawLooper::kMaskFilter_Bit; // our blur 84 info.fPaintBits |= SkLayerDrawLooper::kMaskFilter_Bit; // our blur
85 info.fPaintBits |= SkLayerDrawLooper::kColorFilter_Bit; 85 info.fPaintBits |= SkLayerDrawLooper::kColorFilter_Bit;
86 info.fOffset.set(offset.width(), offset.height()); 86 info.fOffset.set(offset.width(), offset.height());
87 info.fPostTranslate = (shadowTransformMode == ShadowIgnoresTransforms); 87 info.fPostTranslate = (shadowTransformMode == ShadowIgnoresTransforms);
88 88
89 SkPaint* paint = m_skDrawLooper->addLayerOnTop(info); 89 SkPaint* paint = m_skDrawLooperBuilder.addLayerOnTop(info);
90 90
91 if (blur) { 91 if (blur) {
92 uint32_t mfFlags = SkBlurMaskFilter::kHighQuality_BlurFlag; 92 uint32_t mfFlags = SkBlurMaskFilter::kHighQuality_BlurFlag;
93 if (shadowTransformMode == ShadowIgnoresTransforms) 93 if (shadowTransformMode == ShadowIgnoresTransforms)
94 mfFlags |= SkBlurMaskFilter::kIgnoreTransform_BlurFlag; 94 mfFlags |= SkBlurMaskFilter::kIgnoreTransform_BlurFlag;
95 RefPtr<SkMaskFilter> mf = adoptRef(SkBlurMaskFilter::Create( 95 RefPtr<SkMaskFilter> mf = adoptRef(SkBlurMaskFilter::Create(
96 (double)blur / 2.0, SkBlurMaskFilter::kNormal_BlurStyle, mfFlags)); 96 (double)blur / 2.0, SkBlurMaskFilter::kNormal_BlurStyle, mfFlags));
97 paint->setMaskFilter(mf.get()); 97 paint->setMaskFilter(mf.get());
98 } 98 }
99 99
100 RefPtr<SkColorFilter> cf = adoptRef(SkColorFilter::CreateModeFilter(skColor, SkXfermode::kSrcIn_Mode)); 100 RefPtr<SkColorFilter> cf = adoptRef(SkColorFilter::CreateModeFilter(skColor, SkXfermode::kSrcIn_Mode));
101 paint->setColorFilter(cf.get()); 101 paint->setColorFilter(cf.get());
102 } 102 }
103 103
104 } // namespace WebCore 104 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698