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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGFEGaussianBlurElement.cpp

Issue 1383013002: SVGFilterBuilder::getEffectById never return nullptr (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, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 invalidate(); 61 invalidate();
62 return; 62 return;
63 } 63 }
64 64
65 SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName); 65 SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName);
66 } 66 }
67 67
68 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEGaussianBlurElement::build(SVGFilterBu ilder* filterBuilder, Filter* filter) 68 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEGaussianBlurElement::build(SVGFilterBu ilder* filterBuilder, Filter* filter)
69 { 69 {
70 FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->curr entValue()->value())); 70 FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->curr entValue()->value()));
71 71 ASSERT(input1);
72 if (!input1)
73 return nullptr;
74 72
75 // "A negative value or a value of zero disables the effect of the given 73 // "A negative value or a value of zero disables the effect of the given
76 // filter primitive (i.e., the result is the filter input image)." 74 // filter primitive (i.e., the result is the filter input image)."
77 // (https://drafts.fxtf.org/filters/#element-attrdef-fegaussianblur-stddevia tion) 75 // (https://drafts.fxtf.org/filters/#element-attrdef-fegaussianblur-stddevia tion)
78 // 76 //
79 // => Clamp to non-negative. 77 // => Clamp to non-negative.
80 float stdDevX = std::max(0.0f, stdDeviationX()->currentValue()->value()); 78 float stdDevX = std::max(0.0f, stdDeviationX()->currentValue()->value());
81 float stdDevY = std::max(0.0f, stdDeviationY()->currentValue()->value()); 79 float stdDevY = std::max(0.0f, stdDeviationY()->currentValue()->value());
82 RefPtrWillBeRawPtr<FilterEffect> effect = FEGaussianBlur::create(filter, std DevX, stdDevY); 80 RefPtrWillBeRawPtr<FilterEffect> effect = FEGaussianBlur::create(filter, std DevX, stdDevY);
83 effect->inputEffects().append(input1); 81 effect->inputEffects().append(input1);
84 return effect.release(); 82 return effect.release();
85 } 83 }
86 84
87 } // namespace blink 85 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698