Fixed cursor hotspot SVG override and made CSSCursorImageValue constant

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

Index: third_party/WebKit/Source/core/css/CSSCursorImageValue.h
diff --git a/third_party/WebKit/Source/core/css/CSSCursorImageValue.h b/third_party/WebKit/Source/core/css/CSSCursorImageValue.h
index a989590577506bf4382e22296ba90d668d42d231..1f9068c3d3aa0590563b4dc154b302ee004aaa28 100644
--- a/third_party/WebKit/Source/core/css/CSSCursorImageValue.h
+++ b/third_party/WebKit/Source/core/css/CSSCursorImageValue.h
@@ -22,6 +22,7 @@
 #define CSSCursorImageValue_h
 
 #include "core/css/CSSImageValue.h"
+#include "core/svg/SVGCursorElement.h"
 #include "platform/geometry/IntPoint.h"
 #include "wtf/HashSet.h"
 
@@ -45,7 +46,11 @@ public:
 
     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);
@@ -57,16 +62,17 @@ public:
 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());