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

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

Issue 664433002: [SVG] Move negative viewBox width/height reporting to SVGAnimatedViewBoxRect (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: no need for manual rebaseline Created 6 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 | « Source/core/svg/SVGFitToViewBox.h ('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 15 matching lines...) Expand all
26 #include "core/dom/Attribute.h" 26 #include "core/dom/Attribute.h"
27 #include "core/svg/SVGDocumentExtensions.h" 27 #include "core/svg/SVGDocumentExtensions.h"
28 #include "core/svg/SVGElement.h" 28 #include "core/svg/SVGElement.h"
29 #include "core/svg/SVGParserUtilities.h" 29 #include "core/svg/SVGParserUtilities.h"
30 #include "platform/geometry/FloatRect.h" 30 #include "platform/geometry/FloatRect.h"
31 #include "platform/transforms/AffineTransform.h" 31 #include "platform/transforms/AffineTransform.h"
32 #include "wtf/text/StringImpl.h" 32 #include "wtf/text/StringImpl.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 class SVGAnimatedViewBoxRect : public SVGAnimatedRect {
37 public:
38 static PassRefPtr<SVGAnimatedRect> create(SVGElement* contextElement)
39 {
40 return adoptRef(new SVGAnimatedViewBoxRect(contextElement));
41 }
42
43 void setBaseValueAsString(const String&, SVGParsingError&) override;
44
45 protected:
46 SVGAnimatedViewBoxRect(SVGElement* contextElement)
47 : SVGAnimatedRect(contextElement, SVGNames::viewBoxAttr)
48 {
49 }
50 };
51
52 void SVGAnimatedViewBoxRect::setBaseValueAsString(const String& value, SVGParsin gError& parseError)
53 {
54 TrackExceptionState es;
55
56 baseValue()->setValueAsString(value, es);
57
58 if (es.hadException()) {
59 parseError = ParsingAttributeFailedError;
60 return;
61 }
62
63 if (baseValue()->width() < 0.0f) {
fs 2014/10/16 08:11:55 Nit: I don't mind personally, but I think that cod
64 parseError = NegativeValueForbiddenError;
65 baseValue()->setInvalid();
66 return;
67 }
68 if (baseValue()->height() < 0.0f) {
69 parseError = NegativeValueForbiddenError;
70 baseValue()->setInvalid();
71 return;
72 }
73 }
74
36 SVGFitToViewBox::SVGFitToViewBox(SVGElement* element, PropertyMapPolicy property MapPolicy) 75 SVGFitToViewBox::SVGFitToViewBox(SVGElement* element, PropertyMapPolicy property MapPolicy)
37 : m_viewBox(SVGAnimatedRect::create(element, SVGNames::viewBoxAttr)) 76 : m_viewBox(SVGAnimatedViewBoxRect::create(element))
38 , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(element, SVGN ames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create())) 77 , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(element, SVGN ames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
39 { 78 {
40 ASSERT(element); 79 ASSERT(element);
41 if (propertyMapPolicy == PropertyMapPolicyAdd) { 80 if (propertyMapPolicy == PropertyMapPolicyAdd) {
42 element->addToPropertyMap(m_viewBox); 81 element->addToPropertyMap(m_viewBox);
43 element->addToPropertyMap(m_preserveAspectRatio); 82 element->addToPropertyMap(m_preserveAspectRatio);
44 } 83 }
45 } 84 }
46 85
47 AffineTransform SVGFitToViewBox::viewBoxToViewTransform(const FloatRect& viewBox Rect, PassRefPtr<SVGPreserveAspectRatio> preserveAspectRatio, float viewWidth, f loat viewHeight) 86 AffineTransform SVGFitToViewBox::viewBoxToViewTransform(const FloatRect& viewBox Rect, PassRefPtr<SVGPreserveAspectRatio> preserveAspectRatio, float viewWidth, f loat viewHeight)
(...skipping 15 matching lines...) Expand all
63 supportedAttributes.add(SVGNames::preserveAspectRatioAttr); 102 supportedAttributes.add(SVGNames::preserveAspectRatioAttr);
64 } 103 }
65 104
66 void SVGFitToViewBox::updateViewBox(const FloatRect& rect) 105 void SVGFitToViewBox::updateViewBox(const FloatRect& rect)
67 { 106 {
68 ASSERT(m_viewBox); 107 ASSERT(m_viewBox);
69 m_viewBox->baseValue()->setValue(rect); 108 m_viewBox->baseValue()->setValue(rect);
70 } 109 }
71 110
72 } 111 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGFitToViewBox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698