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

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

Issue 2738863002: Replace ASSERT with DCHECK in core/svg/ (Closed)
Patch Set: Split DCHECKS wherever possible Created 3 years, 9 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, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 visitor->trace(m_ry); 57 visitor->trace(m_ry);
58 SVGGeometryElement::trace(visitor); 58 SVGGeometryElement::trace(visitor);
59 } 59 }
60 60
61 DEFINE_NODE_FACTORY(SVGEllipseElement) 61 DEFINE_NODE_FACTORY(SVGEllipseElement)
62 62
63 Path SVGEllipseElement::asPath() const { 63 Path SVGEllipseElement::asPath() const {
64 Path path; 64 Path path;
65 65
66 SVGLengthContext lengthContext(this); 66 SVGLengthContext lengthContext(this);
67 ASSERT(layoutObject()); 67 DCHECK(layoutObject());
68 const ComputedStyle& style = layoutObject()->styleRef(); 68 const ComputedStyle& style = layoutObject()->styleRef();
69 const SVGComputedStyle& svgStyle = style.svgStyle(); 69 const SVGComputedStyle& svgStyle = style.svgStyle();
70 70
71 float rx = 71 float rx =
72 lengthContext.valueForLength(svgStyle.rx(), style, SVGLengthMode::Width); 72 lengthContext.valueForLength(svgStyle.rx(), style, SVGLengthMode::Width);
73 if (rx < 0) 73 if (rx < 0)
74 return path; 74 return path;
75 float ry = 75 float ry =
76 lengthContext.valueForLength(svgStyle.ry(), style, SVGLengthMode::Height); 76 lengthContext.valueForLength(svgStyle.ry(), style, SVGLengthMode::Height);
77 if (ry < 0) 77 if (ry < 0)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 m_cy->currentValue()->isRelative() || 140 m_cy->currentValue()->isRelative() ||
141 m_rx->currentValue()->isRelative() || 141 m_rx->currentValue()->isRelative() ||
142 m_ry->currentValue()->isRelative(); 142 m_ry->currentValue()->isRelative();
143 } 143 }
144 144
145 LayoutObject* SVGEllipseElement::createLayoutObject(const ComputedStyle&) { 145 LayoutObject* SVGEllipseElement::createLayoutObject(const ComputedStyle&) {
146 return new LayoutSVGEllipse(this); 146 return new LayoutSVGEllipse(this);
147 } 147 }
148 148
149 } // namespace blink 149 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGElementRareData.cpp ('k') | third_party/WebKit/Source/core/svg/SVGEnumeration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698