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

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

Issue 1544673003: Refactor propagation of parsing errors for SVG attributes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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, 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 20 matching lines...) Expand all
31 31
32 namespace blink { 32 namespace blink {
33 33
34 class SVGAnimatedViewBoxRect : public SVGAnimatedRect { 34 class SVGAnimatedViewBoxRect : public SVGAnimatedRect {
35 public: 35 public:
36 static PassRefPtrWillBeRawPtr<SVGAnimatedRect> create(SVGElement* contextEle ment) 36 static PassRefPtrWillBeRawPtr<SVGAnimatedRect> create(SVGElement* contextEle ment)
37 { 37 {
38 return adoptRefWillBeNoop(new SVGAnimatedViewBoxRect(contextElement)); 38 return adoptRefWillBeNoop(new SVGAnimatedViewBoxRect(contextElement));
39 } 39 }
40 40
41 void setBaseValueAsString(const String&, SVGParsingError&) override; 41 SVGParsingError setBaseValueAsString(const String&) override;
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 void SVGAnimatedViewBoxRect::setBaseValueAsString(const String& value, SVGParsin gError& parseError) 50 SVGParsingError SVGAnimatedViewBoxRect::setBaseValueAsString(const String& value )
51 { 51 {
52 TrackExceptionState es; 52 SVGParsingError parseStatus = baseValue()->setValueAsString(value);
53 53
54 baseValue()->setValueAsString(value, es); 54 if (parseStatus == NoError && (baseValue()->width() < 0 || baseValue()->heig ht() < 0)) {
55 55 parseStatus = NegativeValueForbiddenError;
56 if (es.hadException()) {
57 parseError = ParsingAttributeFailedError;
58 return;
59 }
60
61 if (baseValue()->width() < 0 || baseValue()->height() < 0) {
62 parseError = NegativeValueForbiddenError;
63 baseValue()->setInvalid(); 56 baseValue()->setInvalid();
64 } 57 }
58 return parseStatus;
65 } 59 }
66 60
67 SVGFitToViewBox::SVGFitToViewBox(SVGElement* element, PropertyMapPolicy property MapPolicy) 61 SVGFitToViewBox::SVGFitToViewBox(SVGElement* element, PropertyMapPolicy property MapPolicy)
68 : m_viewBox(SVGAnimatedViewBoxRect::create(element)) 62 : m_viewBox(SVGAnimatedViewBoxRect::create(element))
69 , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(element, SVGN ames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create())) 63 , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(element, SVGN ames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
70 { 64 {
71 ASSERT(element); 65 ASSERT(element);
72 if (propertyMapPolicy == PropertyMapPolicyAdd) { 66 if (propertyMapPolicy == PropertyMapPolicyAdd) {
73 element->addToPropertyMap(m_viewBox); 67 element->addToPropertyMap(m_viewBox);
74 element->addToPropertyMap(m_preserveAspectRatio); 68 element->addToPropertyMap(m_preserveAspectRatio);
(...skipping 19 matching lines...) Expand all
94 return attrName == SVGNames::viewBoxAttr || attrName == SVGNames::preserveAs pectRatioAttr; 88 return attrName == SVGNames::viewBoxAttr || attrName == SVGNames::preserveAs pectRatioAttr;
95 } 89 }
96 90
97 void SVGFitToViewBox::updateViewBox(const FloatRect& rect) 91 void SVGFitToViewBox::updateViewBox(const FloatRect& rect)
98 { 92 {
99 ASSERT(m_viewBox); 93 ASSERT(m_viewBox);
100 m_viewBox->baseValue()->setValue(rect); 94 m_viewBox->baseValue()->setValue(rect);
101 } 95 }
102 96
103 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698