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

Side by Side Diff: third_party/WebKit/Source/core/style/SVGComputedStyleDefs.cpp

Issue 1439793003: SVG: Promote d to a property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DECLARE_VIRTUAL_TRACE Created 5 years 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, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 2004, 2005, 2007 Rob Buis <buis@kde.org> 3 2004, 2005, 2007 Rob Buis <buis@kde.org>
4 Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 5
6 Based on khtml code by: 6 Based on khtml code by:
7 Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 7 Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
8 Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org) 8 Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
9 Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org) 9 Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org)
10 Copyright (C) 2002 Apple Computer, Inc. 10 Copyright (C) 2002 Apple Computer, Inc.
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 } 194 }
195 195
196 bool StyleInheritedResourceData::operator==(const StyleInheritedResourceData& ot her) const 196 bool StyleInheritedResourceData::operator==(const StyleInheritedResourceData& ot her) const
197 { 197 {
198 return markerStart == other.markerStart 198 return markerStart == other.markerStart
199 && markerMid == other.markerMid 199 && markerMid == other.markerMid
200 && markerEnd == other.markerEnd; 200 && markerEnd == other.markerEnd;
201 } 201 }
202 202
203 StyleLayoutData::StyleLayoutData() 203 StyleLayoutData::StyleLayoutData()
204 : cx(SVGComputedStyle::initialCx()) 204 : d(CSSPathValue::emptyPathValue())
205 , cx(SVGComputedStyle::initialCx())
205 , cy(SVGComputedStyle::initialCy()) 206 , cy(SVGComputedStyle::initialCy())
206 , x(SVGComputedStyle::initialX()) 207 , x(SVGComputedStyle::initialX())
207 , y(SVGComputedStyle::initialY()) 208 , y(SVGComputedStyle::initialY())
208 , r(SVGComputedStyle::initialR()) 209 , r(SVGComputedStyle::initialR())
209 , rx(SVGComputedStyle::initialRx()) 210 , rx(SVGComputedStyle::initialRx())
210 , ry(SVGComputedStyle::initialRy()) 211 , ry(SVGComputedStyle::initialRy())
211 { 212 {
212 } 213 }
213 214
214 inline StyleLayoutData::StyleLayoutData(const StyleLayoutData& other) 215 inline StyleLayoutData::StyleLayoutData(const StyleLayoutData& other)
215 : RefCounted<StyleLayoutData>() 216 : RefCounted<StyleLayoutData>()
217 , d(other.d)
216 , cx(other.cx) 218 , cx(other.cx)
217 , cy(other.cy) 219 , cy(other.cy)
218 , x(other.x) 220 , x(other.x)
219 , y(other.y) 221 , y(other.y)
220 , r(other.r) 222 , r(other.r)
221 , rx(other.rx) 223 , rx(other.rx)
222 , ry(other.ry) 224 , ry(other.ry)
223 { 225 {
224 } 226 }
225 227
226 PassRefPtr<StyleLayoutData> StyleLayoutData::copy() const 228 PassRefPtr<StyleLayoutData> StyleLayoutData::copy() const
227 { 229 {
228 return adoptRef(new StyleLayoutData(*this)); 230 return adoptRef(new StyleLayoutData(*this));
229 } 231 }
230 232
231 bool StyleLayoutData::operator==(const StyleLayoutData& other) const 233 bool StyleLayoutData::operator==(const StyleLayoutData& other) const
232 { 234 {
233 return x == other.x 235 return x == other.x
234 && y == other.y 236 && y == other.y
235 && r == other.r 237 && r == other.r
236 && rx == other.rx 238 && rx == other.rx
237 && ry == other.ry 239 && ry == other.ry
238 && cx == other.cx 240 && cx == other.cx
239 && cy == other.cy; 241 && cy == other.cy
242 && d->equals(*other.d);
240 } 243 }
241 244
242 } 245 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698