Fixed cursor hotspot SVG override and made CSSCursorImageValue constant

third_party/WebKit/Source/core/css/CSSCursorImageValue.h

 /*
  * Copyright (C) 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All right reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef CSSCursorImageValue_h
 #define CSSCursorImageValue_h
 
 #include "core/css/CSSImageValue.h"
+#include "core/svg/SVGCursorElement.h"
 #include "platform/geometry/IntPoint.h"
 #include "wtf/HashSet.h"
 
 namespace blink {
 
 class Element;
 class SVGElement;
 
 class CSSCursorImageValue : public CSSValue {
 public:
     static CSSCursorImageValue* create(CSSValue* imageValue, bool hotSpotSpecified, const IntPoint& hotSpot)
     {
         return new CSSCursorImageValue(imageValue, hotSpotSpecified, hotSpot);
     }
 
     ~CSSCursorImageValue();
 
     bool hotSpotSpecified() const { return m_hotSpotSpecified; }
 
     IntPoint hotSpot() const { return m_hotSpot; }
 
     String customCSSText() const;
 
-    bool updateIfSVGCursorIsUsed(Element*);
+    SVGCursorElement* getSVGCursorElement(Element*) const;
+
+    // Invalidates the cached image if it's not the given url.
+    void clearCachedImageIfNotURL(String url) const;
+
     bool isCachePending(float deviceScaleFactor) const;
     StyleImage* cachedImage(float deviceScaleFactor) const;
     StyleImage* cacheImage(Document*, float deviceScaleFactor);
 
     bool equals(const CSSCursorImageValue&) const;
 
     DECLARE_TRACE_AFTER_DISPATCH();
 
 private:
     CSSCursorImageValue(CSSValue* imageValue, bool hotSpotSpecified, const IntPoint& hotSpot);
 
-    bool isSVGCursor() const;
-    String cachedImageURL();
-    void clearImageResource();
+    // True if the URL has a fragment identifier (in which case it probably

[Timothy Loh, 2016/05/30 01:38:34]

isn't the function name descriptive enough already? :S

[sashab, 2016/05/31 04:22:37]

Done

+    // refers to an SVG).
+    bool hasFragmentInURL() const;
+    String cachedImageURL() const;
 
     Member<CSSValue> m_imageValue;
 
     bool m_hotSpotSpecified;
     IntPoint m_hotSpot;
-    bool m_isCachePending;
-    Member<StyleImage> m_cachedImage;
+    mutable bool m_isCachePending;
+    mutable Member<StyleImage> m_cachedImage;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCursorImageValue, isCursorImageValue());
 
 } // namespace blink
 
 #endif // CSSCursorImageValue_h