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)) {
+                    // Override the hot spot if it wasn't specified in the CSS but is specified in the SVG.

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

It's not really overriding anything

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

Changed to 'set'

+                    SVGLengthContext lengthContext(0);
+                    if (!hotSpotSpecified && cursorElement->x()) {
+                        float x = roundf(cursorElement->x()->currentValue()->value(lengthContext));
+                        hotSpot.setX(static_cast<int>(x));
+                    }
+                    if (!hotSpotSpecified && cursorElement->y()) {
+                        float y = roundf(cursorElement->y()->currentValue()->value(lengthContext));
+                        hotSpot.setY(static_cast<int>(y));
+                    }
+

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

don't we need to set hotSpotSpecified to true somewhere here? at least the
current code does that

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

Hhhhmmm maybe that's why my tests weren't working... lol

+                    image->clearCachedImageIfNotURL(element->document().completeURL(cursorElement->href()->currentValue()->value()));

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

probably clearer if this moved to the top of this if statement, and if outer if
was pulled out to here so we call clearCachedImage conditionally.

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

Yup agreed done

+
+                    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