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

Side by Side Diff: WebCore/svg/SVGElement.cpp

Issue 6206004: Merge 75008 - Merge 74574 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 9 years, 11 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 | « WebCore/svg/SVGElement.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, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org> 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>
3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 { 215 {
216 SVGElementRareData* rareData = ensureRareSVGData(); 216 SVGElementRareData* rareData = ensureRareSVGData();
217 if (CSSCursorImageValue* oldCursorImageValue = rareData->cursorImageValue()) { 217 if (CSSCursorImageValue* oldCursorImageValue = rareData->cursorImageValue()) {
218 if (cursorImageValue == oldCursorImageValue) 218 if (cursorImageValue == oldCursorImageValue)
219 return; 219 return;
220 oldCursorImageValue->removeReferencedElement(this); 220 oldCursorImageValue->removeReferencedElement(this);
221 } 221 }
222 rareData->setCursorImageValue(cursorImageValue); 222 rareData->setCursorImageValue(cursorImageValue);
223 } 223 }
224 224
225 void SVGElement::cursorImageElementRemoved() 225 void SVGElement::cursorImageValueRemoved()
226 { 226 {
227 ASSERT(hasRareSVGData()); 227 ASSERT(hasRareSVGData());
228 rareSVGData()->setCursorImageValue(0); 228 rareSVGData()->setCursorImageValue(0);
229 } 229 }
230 230
231 void SVGElement::parseMappedAttribute(Attribute* attr) 231 void SVGElement::parseMappedAttribute(Attribute* attr)
232 { 232 {
233 // standard events 233 // standard events
234 if (attr->name() == onloadAttr) 234 if (attr->name() == onloadAttr)
235 setAttributeEventListener(eventNames().loadEvent, createAttributeEventLi stener(this, attr)); 235 setAttributeEventListener(eventNames().loadEvent, createAttributeEventLi stener(this, attr));
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 const_cast<SVGElement*>(this)->synchronizeProperty(name); 367 const_cast<SVGElement*>(this)->synchronizeProperty(name);
368 if (name == anyQName()) 368 if (name == anyQName())
369 setAreSVGAttributesValid(); 369 setAreSVGAttributesValid();
370 370
371 clearIsSynchronizingSVGAttributes(); 371 clearIsSynchronizingSVGAttributes();
372 } 372 }
373 373
374 } 374 }
375 375
376 #endif // ENABLE(SVG) 376 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « WebCore/svg/SVGElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698