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

Side by Side Diff: Source/core/css/CSSCursorImageValue.cpp

Issue 1311783009: Fix bug in CSSCursorImageValue::equals() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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) 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 String CSSCursorImageValue::customCSSText() const 76 String CSSCursorImageValue::customCSSText() const
77 { 77 {
78 StringBuilder result; 78 StringBuilder result;
79 result.append(m_imageValue->cssText()); 79 result.append(m_imageValue->cssText());
80 if (m_hotSpotSpecified) { 80 if (m_hotSpotSpecified) {
81 result.append(' '); 81 result.append(' ');
82 result.appendNumber(m_hotSpot.x()); 82 result.appendNumber(m_hotSpot.x());
83 result.append(' '); 83 result.append(' ');
84 result.appendNumber(m_hotSpot.y()); 84 result.appendNumber(m_hotSpot.y());
85 } 85 }
86
Timothy Loh 2015/08/26 07:25:58 ..not related?
86 return result.toString(); 87 return result.toString();
87 } 88 }
88 89
89 bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element) 90 bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element)
90 { 91 {
91 if (!element || !element->isSVGElement()) 92 if (!element || !element->isSVGElement())
92 return false; 93 return false;
93 94
94 if (!isSVGCursor()) 95 if (!isSVGCursor())
95 return false; 96 return false;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 190
190 #if !ENABLE(OILPAN) 191 #if !ENABLE(OILPAN)
191 void CSSCursorImageValue::removeReferencedElement(SVGElement* element) 192 void CSSCursorImageValue::removeReferencedElement(SVGElement* element)
192 { 193 {
193 m_referencedElements.remove(element); 194 m_referencedElements.remove(element);
194 } 195 }
195 #endif 196 #endif
196 197
197 bool CSSCursorImageValue::equals(const CSSCursorImageValue& other) const 198 bool CSSCursorImageValue::equals(const CSSCursorImageValue& other) const
198 { 199 {
199 return m_hotSpotSpecified ? other.m_hotSpotSpecified && m_hotSpot == other.m _hotSpot : !other.m_hotSpotSpecified 200 return (m_hotSpotSpecified ? other.m_hotSpotSpecified && m_hotSpot == other. m_hotSpot : !other.m_hotSpotSpecified)
200 && compareCSSValuePtr(m_imageValue, other.m_imageValue); 201 && compareCSSValuePtr(m_imageValue, other.m_imageValue);
201 } 202 }
202 203
203 DEFINE_TRACE_AFTER_DISPATCH(CSSCursorImageValue) 204 DEFINE_TRACE_AFTER_DISPATCH(CSSCursorImageValue)
204 { 205 {
205 visitor->trace(m_imageValue); 206 visitor->trace(m_imageValue);
206 visitor->trace(m_image); 207 visitor->trace(m_image);
207 CSSValue::traceAfterDispatch(visitor); 208 CSSValue::traceAfterDispatch(visitor);
208 } 209 }
209 210
210 } // namespace blink 211 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698