Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 Loading... | |
| 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 |
| OLD | NEW |