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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp

Issue 1387573003: Pass SkiaImageFilterBuilder& to FilterEffect::createImageFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 5 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 case CHANNEL_B: 103 case CHANNEL_B:
104 return SkDisplacementMapEffect::kB_ChannelSelectorType; 104 return SkDisplacementMapEffect::kB_ChannelSelectorType;
105 case CHANNEL_A: 105 case CHANNEL_A:
106 return SkDisplacementMapEffect::kA_ChannelSelectorType; 106 return SkDisplacementMapEffect::kA_ChannelSelectorType;
107 case CHANNEL_UNKNOWN: 107 case CHANNEL_UNKNOWN:
108 default: 108 default:
109 return SkDisplacementMapEffect::kUnknown_ChannelSelectorType; 109 return SkDisplacementMapEffect::kUnknown_ChannelSelectorType;
110 } 110 }
111 } 111 }
112 112
113 PassRefPtr<SkImageFilter> FEDisplacementMap::createImageFilter(SkiaImageFilterBu ilder* builder) 113 PassRefPtr<SkImageFilter> FEDisplacementMap::createImageFilter(SkiaImageFilterBu ilder& builder)
114 { 114 {
115 RefPtr<SkImageFilter> color = builder->build(inputEffect(0), operatingColorS pace()); 115 RefPtr<SkImageFilter> color = builder.build(inputEffect(0), operatingColorSp ace());
116 RefPtr<SkImageFilter> displ = builder->build(inputEffect(1), operatingColorS pace()); 116 RefPtr<SkImageFilter> displ = builder.build(inputEffect(1), operatingColorSp ace());
117 SkDisplacementMapEffect::ChannelSelectorType typeX = toSkiaMode(m_xChannelSe lector); 117 SkDisplacementMapEffect::ChannelSelectorType typeX = toSkiaMode(m_xChannelSe lector);
118 SkDisplacementMapEffect::ChannelSelectorType typeY = toSkiaMode(m_yChannelSe lector); 118 SkDisplacementMapEffect::ChannelSelectorType typeY = toSkiaMode(m_yChannelSe lector);
119 SkImageFilter::CropRect cropRect = getCropRect(builder->cropOffset()); 119 SkImageFilter::CropRect cropRect = getCropRect(builder.cropOffset());
120 // FIXME : Only applyHorizontalScale is used and applyVerticalScale is ignor ed 120 // FIXME : Only applyHorizontalScale is used and applyVerticalScale is ignor ed
121 // This can be fixed by adding a 2nd scale parameter to SkDisplacementMapEff ect 121 // This can be fixed by adding a 2nd scale parameter to SkDisplacementMapEff ect
122 return adoptRef(SkDisplacementMapEffect::Create(typeX, typeY, SkFloatToScala r(filter()->applyHorizontalScale(m_scale)), displ.get(), color.get(), &cropRect) ); 122 return adoptRef(SkDisplacementMapEffect::Create(typeX, typeY, SkFloatToScala r(filter()->applyHorizontalScale(m_scale)), displ.get(), color.get(), &cropRect) );
123 } 123 }
124 124
125 static TextStream& operator<<(TextStream& ts, const ChannelSelectorType& type) 125 static TextStream& operator<<(TextStream& ts, const ChannelSelectorType& type)
126 { 126 {
127 switch (type) { 127 switch (type) {
128 case CHANNEL_UNKNOWN: 128 case CHANNEL_UNKNOWN:
129 ts << "UNKNOWN"; 129 ts << "UNKNOWN";
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 rect = mapPaintRect(rect, false); 169 rect = mapPaintRect(rect, false);
170 rect = inputEffect(0)->determineAbsolutePaintRect(rect); 170 rect = inputEffect(0)->determineAbsolutePaintRect(rect);
171 rect = mapPaintRect(rect, true); 171 rect = mapPaintRect(rect, true);
172 rect.intersect(requestedRect); 172 rect.intersect(requestedRect);
173 173
174 addAbsolutePaintRect(rect); 174 addAbsolutePaintRect(rect);
175 return rect; 175 return rect;
176 } 176 }
177 177
178 } // namespace blink 178 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698