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

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

Issue 2359133003: Fix effect mapping computation for displacement-map w/ negative scale (Closed)
Patch Set: Created 4 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
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/filters/feDisplacementMap-negative-scale-expected.html ('k') | no next file » | 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 (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 30 matching lines...) Expand all
41 41
42 FEDisplacementMap* FEDisplacementMap::create(Filter* filter, ChannelSelectorType xChannelSelector, 42 FEDisplacementMap* FEDisplacementMap::create(Filter* filter, ChannelSelectorType xChannelSelector,
43 ChannelSelectorType yChannelSelector, float scale) 43 ChannelSelectorType yChannelSelector, float scale)
44 { 44 {
45 return new FEDisplacementMap(filter, xChannelSelector, yChannelSelector, sca le); 45 return new FEDisplacementMap(filter, xChannelSelector, yChannelSelector, sca le);
46 } 46 }
47 47
48 FloatRect FEDisplacementMap::mapEffect(const FloatRect& rect) const 48 FloatRect FEDisplacementMap::mapEffect(const FloatRect& rect) const
49 { 49 {
50 FloatRect result = rect; 50 FloatRect result = rect;
51 result.inflateX(getFilter()->applyHorizontalScale(m_scale / 2)); 51 result.inflateX(getFilter()->applyHorizontalScale(std::abs(m_scale) / 2));
52 result.inflateY(getFilter()->applyVerticalScale(m_scale / 2)); 52 result.inflateY(getFilter()->applyVerticalScale(std::abs(m_scale) / 2));
53 return result; 53 return result;
54 } 54 }
55 55
56 FloatRect FEDisplacementMap::mapInputs(const FloatRect& rect) const 56 FloatRect FEDisplacementMap::mapInputs(const FloatRect& rect) const
57 { 57 {
58 return inputEffect(0)->mapRect(rect); 58 return inputEffect(0)->mapRect(rect);
59 } 59 }
60 60
61 ChannelSelectorType FEDisplacementMap::xChannelSelector() const 61 ChannelSelectorType FEDisplacementMap::xChannelSelector() const
62 { 62 {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 FilterEffect::externalRepresentation(ts); 155 FilterEffect::externalRepresentation(ts);
156 ts << " scale=\"" << m_scale << "\" " 156 ts << " scale=\"" << m_scale << "\" "
157 << "xChannelSelector=\"" << m_xChannelSelector << "\" " 157 << "xChannelSelector=\"" << m_xChannelSelector << "\" "
158 << "yChannelSelector=\"" << m_yChannelSelector << "\"]\n"; 158 << "yChannelSelector=\"" << m_yChannelSelector << "\"]\n";
159 inputEffect(0)->externalRepresentation(ts, indent + 1); 159 inputEffect(0)->externalRepresentation(ts, indent + 1);
160 inputEffect(1)->externalRepresentation(ts, indent + 1); 160 inputEffect(1)->externalRepresentation(ts, indent + 1);
161 return ts; 161 return ts;
162 } 162 }
163 163
164 } // namespace blink 164 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/filters/feDisplacementMap-negative-scale-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698