Fixed cursor hotspot SVG override and made CSSCursorImageValue constant

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

 /*
  * Copyright (C) 2006 Rob Buis <buis@kde.org>
  *           (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights 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.
  *
@@ skipping 50 matching lines @@
     result.append(m_imageValue->cssText());
     if (m_hotSpotSpecified) {
         result.append(' ');
         result.appendNumber(m_hotSpot.x());
         result.append(' ');
         result.appendNumber(m_hotSpot.y());
     }
     return result.toString();
 }
 
-bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element)
+SVGCursorElement* CSSCursorImageValue::getSVGCursorElement(Element* element) const
 {
     if (!element || !element->isSVGElement())
-        return false;
+        return nullptr;
 
-    if (!isSVGCursor())
-        return false;
+    if (!hasFragmentInURL())
+        return nullptr;
 
     String url = toCSSImageValue(m_imageValue.get())->url();
-    if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(url, element->treeScope())) {
-        // FIXME: This will override hot spot specified in CSS, which is probably incorrect.
-        SVGLengthContext lengthContext(0);
-        m_hotSpotSpecified = true;
-        float x = roundf(cursorElement->x()->currentValue()->value(lengthContext));
-        m_hotSpot.setX(static_cast<int>(x));
+    return resourceReferencedByCursorElement(url, element->treeScope());
+}
 
-        float y = roundf(cursorElement->y()->currentValue()->value(lengthContext));
-        m_hotSpot.setY(static_cast<int>(y));
-
-        if (cachedImageURL() != element->document().completeURL(cursorElement->href()->currentValue()->value()))
-            clearImageResource();
-
-        SVGElement* svgElement = toSVGElement(element);
-        svgElement->setCursorImageValue(this);
-        cursorElement->addClient(svgElement);
-        return true;
-    }
-
-    return false;
+void CSSCursorImageValue::clearCachedImage() const
+{
+    m_cachedImage = nullptr;
+    m_isCachePending = true;
 }
 
 bool CSSCursorImageValue::isCachePending(float deviceScaleFactor) const
 {
     // Need to delegate completely so that changes in device scale factor can be handled appropriately.
     if (m_imageValue->isImageSetValue())
         return toCSSImageSetValue(*m_imageValue).isCachePending(deviceScaleFactor);
     return m_isCachePending;
 }
 
+String CSSCursorImageValue::cachedImageURL() const
+{
+    if (!m_cachedImage || !m_cachedImage->isImageResource())
+        return String();
+    return toStyleFetchedImage(m_cachedImage)->cachedImage()->url().getString();
+}
+
 StyleImage* CSSCursorImageValue::cachedImage(float deviceScaleFactor) const
 {
     ASSERT(!isCachePending(deviceScaleFactor));
 
     if (m_imageValue->isImageSetValue())
         return toCSSImageSetValue(*m_imageValue).cachedImage(deviceScaleFactor);
     return m_cachedImage.get();
 }
 
 StyleImage* CSSCursorImageValue::cacheImage(Document* document, float deviceScaleFactor)
 {
     if (m_imageValue->isImageSetValue())
         return toCSSImageSetValue(*m_imageValue).cacheImage(document, deviceScaleFactor);
 
     if (m_isCachePending) {
         m_isCachePending = false;
 
         // For SVG images we need to lazily substitute in the correct URL. Rather than attempt
         // to change the URL of the CSSImageValue (which would then change behavior like cssText),
         // we create an alternate CSSImageValue to use.
-        if (isSVGCursor() && document) {
+        if (hasFragmentInURL() && document) {
             CSSImageValue* imageValue = toCSSImageValue(m_imageValue.get());
             // FIXME: This will fail if the <cursor> element is in a shadow DOM (bug 59827)
             if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(imageValue->url(), *document)) {
                 CSSImageValue* svgImageValue = CSSImageValue::create(document->completeURL(cursorElement->href()->currentValue()->value()));
                 svgImageValue->setReferrer(imageValue->referrer());
                 m_cachedImage = svgImageValue->cacheImage(document);
                 return m_cachedImage.get();
             }
         }
 
         if (m_imageValue->isImageValue())
             m_cachedImage = toCSSImageValue(*m_imageValue).cacheImage(document);
     }
 
     if (m_cachedImage && m_cachedImage->isImageResource())
         return toStyleFetchedImage(m_cachedImage);
     return nullptr;
 }
 
-bool CSSCursorImageValue::isSVGCursor() const
+bool CSSCursorImageValue::hasFragmentInURL() const
 {
     if (m_imageValue->isImageValue()) {
         CSSImageValue* imageValue = toCSSImageValue(m_imageValue.get());
         KURL kurl(ParsedURLString, imageValue->url());
         return kurl.hasFragmentIdentifier();
     }
     return false;
 }
 
-String CSSCursorImageValue::cachedImageURL()

[Timothy Loh, 2016/05/31 05:04:35]

would be nicer if you left the functions in the same place (order here doesn't
really need to match the header file)

[sashab, 2016/05/31 05:24:12]

Done, also renamed clearCachedImage() back to clearImageResource() which is what
it was called before the change :)

-{
-    if (!m_cachedImage || !m_cachedImage->isImageResource())
-        return String();
-    return toStyleFetchedImage(m_cachedImage)->cachedImage()->url().getString();
-}
-
-void CSSCursorImageValue::clearImageResource()
-{
-    m_cachedImage = nullptr;
-    m_isCachePending = true;
-}
-
 bool CSSCursorImageValue::equals(const CSSCursorImageValue& other) const
 {
     return (m_hotSpotSpecified ? other.m_hotSpotSpecified && m_hotSpot == other.m_hotSpot : !other.m_hotSpotSpecified)
         && compareCSSValuePtr(m_imageValue, other.m_imageValue);
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCursorImageValue)
 {
     visitor->trace(m_imageValue);
     visitor->trace(m_cachedImage);
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink