Fixed cursor hotspot SVG override and made CSSCursorImageValue constant

third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
@@ skipping 180 matching lines @@
 {
     state.style()->clearCursorList();
     if (value->isValueList()) {
         CSSValueList* list = toCSSValueList(value);
         int len = list->length();
         state.style()->setCursor(CURSOR_AUTO);
         for (int i = 0; i < len; i++) {
             CSSValue* item = list->item(i);
             if (item->isCursorImageValue()) {
                 CSSCursorImageValue* image = toCSSCursorImageValue(item);
-                if (image->updateIfSVGCursorIsUsed(state.element())) // Elements with SVG cursors are not allowed to share style.
+                IntPoint hotSpot = image->hotSpot();
+                bool hotSpotSpecified = image->hotSpotSpecified();
+
+                Element* element = state.element();
+                if (SVGCursorElement* cursorElement = image->getSVGCursorElement(element)) {
+                    if (image->cachedImageURL() != element->document().completeURL(cursorElement->href()->currentValue()->value()))
+                        image->clearImageResource();
+
+                    // Set the hot spot if it wasn't specified in the CSS but is specified in the SVG.
+                    if (!hotSpotSpecified) {
+                        hotSpotSpecified = true;
+                        SVGLengthContext lengthContext(0);
+                        // x() and y() return 0 if they're not specified in cursorElement.
+                        float svgX = roundf(cursorElement->x()->currentValue()->value(lengthContext));
+                        hotSpot.setX(static_cast<int>(svgX));
+                        float svgY = roundf(cursorElement->y()->currentValue()->value(lengthContext));
+                        hotSpot.setY(static_cast<int>(svgY));
+                    }
+
+                    SVGElement* svgElement = toSVGElement(element);
+                    svgElement->setCursorImageValue(image);
+                    cursorElement->addClient(svgElement);
+
+                    // Elements with SVG cursors are not allowed to share style.
                     state.style()->setUnique();
-                state.style()->addCursor(state.styleImage(CSSPropertyCursor, *image), image->hotSpotSpecified(), image->hotSpot());
+                }
+
+                state.style()->addCursor(state.styleImage(CSSPropertyCursor, *image), hotSpotSpecified, hotSpot);
             } else {
                 state.style()->setCursor(toCSSPrimitiveValue(item)->convertTo<ECursor>());
             }
         }
     } else {
         state.style()->setCursor(toCSSPrimitiveValue(value)->convertTo<ECursor>());
     }
 }
 
 void StyleBuilderFunctions::applyValueCSSPropertyDirection(StyleResolverState& state, CSSValue* value)
@@ skipping 632 matching lines @@
     }
 }
 
 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState& state)
 {
     if (!state.parentNode()->isDocumentNode())
         state.style()->setPosition(state.parentStyle()->position());
 }
 
 } // namespace blink