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

Side by Side Diff: Source/WebCore/svg/SVGCursorElement.cpp

Issue 6596050: Merge 79476 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 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
« no previous file with comments | « LayoutTests/svg/css/multiple-cursors-crash-expected.txt ('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, 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 73 }
74 74
75 void SVGCursorElement::addClient(SVGElement* element) 75 void SVGCursorElement::addClient(SVGElement* element)
76 { 76 {
77 m_clients.add(element); 77 m_clients.add(element);
78 element->setCursorElement(this); 78 element->setCursorElement(this);
79 } 79 }
80 80
81 void SVGCursorElement::removeClient(SVGElement* element) 81 void SVGCursorElement::removeClient(SVGElement* element)
82 { 82 {
83 m_clients.remove(element); 83 HashSet<SVGElement*>::iterator it = m_clients.find(element);
84 element->cursorElementRemoved(); 84 if (it != m_clients.end()) {
85 m_clients.remove(it);
86 element->cursorElementRemoved();
87 }
85 } 88 }
86 89
87 void SVGCursorElement::removeReferencedElement(SVGElement* element) 90 void SVGCursorElement::removeReferencedElement(SVGElement* element)
88 { 91 {
89 m_clients.remove(element); 92 m_clients.remove(element);
90 } 93 }
91 94
92 void SVGCursorElement::svgAttributeChanged(const QualifiedName& attrName) 95 void SVGCursorElement::svgAttributeChanged(const QualifiedName& attrName)
93 { 96 {
94 SVGElement::svgAttributeChanged(attrName); 97 SVGElement::svgAttributeChanged(attrName);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 void SVGCursorElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) cons t 137 void SVGCursorElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) cons t
135 { 138 {
136 SVGElement::addSubresourceAttributeURLs(urls); 139 SVGElement::addSubresourceAttributeURLs(urls);
137 140
138 addSubresourceURL(urls, document()->completeURL(href())); 141 addSubresourceURL(urls, document()->completeURL(href()));
139 } 142 }
140 143
141 } 144 }
142 145
143 #endif // ENABLE(SVG) 146 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « LayoutTests/svg/css/multiple-cursors-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698