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

Side by Side Diff: WebCore/css/CSSCursorImageValue.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 | « LayoutTests/svg/css/cursor-image-replace-expected.txt ('k') | WebCore/svg/SVGElement.h » ('j') | 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) 2006 Rob Buis <buis@kde.org> 2 * Copyright (C) 2006 Rob Buis <buis@kde.org>
3 * (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> 3 * (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #if ENABLE(SVG) 63 #if ENABLE(SVG)
64 const String& url = getStringValue(); 64 const String& url = getStringValue();
65 if (!isSVGCursorIdentifier(url)) 65 if (!isSVGCursorIdentifier(url))
66 return; 66 return;
67 67
68 HashSet<SVGElement*>::const_iterator it = m_referencedElements.begin(); 68 HashSet<SVGElement*>::const_iterator it = m_referencedElements.begin();
69 HashSet<SVGElement*>::const_iterator end = m_referencedElements.end(); 69 HashSet<SVGElement*>::const_iterator end = m_referencedElements.end();
70 70
71 for (; it != end; ++it) { 71 for (; it != end; ++it) {
72 SVGElement* referencedElement = *it; 72 SVGElement* referencedElement = *it;
73 referencedElement->cursorElementRemoved(); 73 referencedElement->cursorImageValueRemoved();
74 if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement( url, referencedElement->document())) 74 if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement( url, referencedElement->document()))
75 cursorElement->removeClient(referencedElement); 75 cursorElement->removeClient(referencedElement);
76 } 76 }
77 #endif 77 #endif
78 } 78 }
79 79
80 bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element) 80 bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element)
81 { 81 {
82 #if !ENABLE(SVG) 82 #if !ENABLE(SVG)
83 UNUSED_PARAM(element); 83 UNUSED_PARAM(element);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 126 }
127 127
128 #if ENABLE(SVG) 128 #if ENABLE(SVG)
129 void CSSCursorImageValue::removeReferencedElement(SVGElement* element) 129 void CSSCursorImageValue::removeReferencedElement(SVGElement* element)
130 { 130 {
131 m_referencedElements.remove(element); 131 m_referencedElements.remove(element);
132 } 132 }
133 #endif 133 #endif
134 134
135 } // namespace WebCore 135 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/svg/css/cursor-image-replace-expected.txt ('k') | WebCore/svg/SVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698