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

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

Issue 2037573002: Empty SVG viewbox should be treated invalid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/custom/empty-viewbox-attr-expected.svg ('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, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Rob Buis <buis@kde.org>
4 * Copyright (C) 2014 Samsung Electronics. All rights reserved. 4 * Copyright (C) 2014 Samsung Electronics. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 protected: 43 protected:
44 SVGAnimatedViewBoxRect(SVGElement* contextElement) 44 SVGAnimatedViewBoxRect(SVGElement* contextElement)
45 : SVGAnimatedRect(contextElement, SVGNames::viewBoxAttr) 45 : SVGAnimatedRect(contextElement, SVGNames::viewBoxAttr)
46 { 46 {
47 } 47 }
48 }; 48 };
49 49
50 SVGParsingError SVGAnimatedViewBoxRect::setBaseValueAsString(const String& value ) 50 SVGParsingError SVGAnimatedViewBoxRect::setBaseValueAsString(const String& value )
51 { 51 {
52 // Empty string should be treated as invalid viewBox
53 if (value.isEmpty()) {
fs 2016/06/03 08:58:03 Should probably fix this down in SVGRect instead.
Shanmuga Pandi 2016/06/03 10:20:53 Done.
54 baseValue()->setInvalid();
55 return SVGParseStatus::NoError;
56 }
57
52 SVGParsingError parseStatus = SVGAnimatedRect::setBaseValueAsString(value); 58 SVGParsingError parseStatus = SVGAnimatedRect::setBaseValueAsString(value);
53 59
54 if (parseStatus == SVGParseStatus::NoError && (baseValue()->width() < 0 || b aseValue()->height() < 0)) { 60 if (parseStatus == SVGParseStatus::NoError && (baseValue()->width() < 0 || b aseValue()->height() < 0)) {
55 parseStatus = SVGParseStatus::NegativeValue; 61 parseStatus = SVGParseStatus::NegativeValue;
56 baseValue()->setInvalid(); 62 baseValue()->setInvalid();
57 } 63 }
58 return parseStatus; 64 return parseStatus;
59 } 65 }
60 66
61 SVGFitToViewBox::SVGFitToViewBox(SVGElement* element, PropertyMapPolicy property MapPolicy) 67 SVGFitToViewBox::SVGFitToViewBox(SVGElement* element, PropertyMapPolicy property MapPolicy)
(...skipping 26 matching lines...) Expand all
88 return attrName == SVGNames::viewBoxAttr || attrName == SVGNames::preserveAs pectRatioAttr; 94 return attrName == SVGNames::viewBoxAttr || attrName == SVGNames::preserveAs pectRatioAttr;
89 } 95 }
90 96
91 void SVGFitToViewBox::updateViewBox(const FloatRect& rect) 97 void SVGFitToViewBox::updateViewBox(const FloatRect& rect)
92 { 98 {
93 ASSERT(m_viewBox); 99 ASSERT(m_viewBox);
94 m_viewBox->baseValue()->setValue(rect); 100 m_viewBox->baseValue()->setValue(rect);
95 } 101 }
96 102
97 } // namespace blink 103 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/custom/empty-viewbox-attr-expected.svg ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698