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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGCircleElement.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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 visitor->trace(m_r); 51 visitor->trace(m_r);
52 SVGGeometryElement::trace(visitor); 52 SVGGeometryElement::trace(visitor);
53 } 53 }
54 54
55 DEFINE_NODE_FACTORY(SVGCircleElement) 55 DEFINE_NODE_FACTORY(SVGCircleElement)
56 56
57 Path SVGCircleElement::asPath() const { 57 Path SVGCircleElement::asPath() const {
58 Path path; 58 Path path;
59 59
60 SVGLengthContext lengthContext(this); 60 SVGLengthContext lengthContext(this);
61 ASSERT(layoutObject()); 61 DCHECK(layoutObject());
62 const ComputedStyle& style = layoutObject()->styleRef(); 62 const ComputedStyle& style = layoutObject()->styleRef();
63 const SVGComputedStyle& svgStyle = style.svgStyle(); 63 const SVGComputedStyle& svgStyle = style.svgStyle();
64 64
65 float r = 65 float r =
66 lengthContext.valueForLength(svgStyle.r(), style, SVGLengthMode::Other); 66 lengthContext.valueForLength(svgStyle.r(), style, SVGLengthMode::Other);
67 if (r > 0) { 67 if (r > 0) {
68 path.addEllipse(FloatRect(lengthContext.valueForLength( 68 path.addEllipse(FloatRect(lengthContext.valueForLength(
69 svgStyle.cx(), style, SVGLengthMode::Width) - 69 svgStyle.cx(), style, SVGLengthMode::Width) -
70 r, 70 r,
71 lengthContext.valueForLength( 71 lengthContext.valueForLength(
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 return m_cx->currentValue()->isRelative() || 123 return m_cx->currentValue()->isRelative() ||
124 m_cy->currentValue()->isRelative() || 124 m_cy->currentValue()->isRelative() ||
125 m_r->currentValue()->isRelative(); 125 m_r->currentValue()->isRelative();
126 } 126 }
127 127
128 LayoutObject* SVGCircleElement::createLayoutObject(const ComputedStyle&) { 128 LayoutObject* SVGCircleElement::createLayoutObject(const ComputedStyle&) {
129 return new LayoutSVGEllipse(this); 129 return new LayoutSVGEllipse(this);
130 } 130 }
131 131
132 } // namespace blink 132 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGBoolean.cpp ('k') | third_party/WebKit/Source/core/svg/SVGDiscardElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698