Changeset 132966 in webkit

Timestamp:

Oct 30, 2012 5:03:27 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

cssText for cursor property doesn't include hotspot
​https://bugs.webkit.org/show_bug.cgi?id=99530

Patch by Rick Byers <​rbyers@chromium.org> on 2012-10-30
Reviewed by Darin Adler.

Source/WebCore:

Implement customCssText in CSSCursorImageValue to include the hotspot when present.
Also explicitly track whether or not a hotspot was supplied in the parser,
while still using the existing convention of (-1,-1) to denote no hotspot
in the rest of the system.

Test: fast/css/cursor-parsing.html

• css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::customCssText):

• css/CSSCursorImageValue.h:

(CSSCursorImageValue):

LayoutTests:

Add simple test for parsing of CSS cursor property.

• fast/css/cursor-parsing-expected.txt: Added.
• fast/css/cursor-parsing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/cursor-parsing-expected.txt (added)
• LayoutTests/fast/css/cursor-parsing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSCursorImageValue.cpp (modified) (3 diffs)
• Source/WebCore/css/CSSCursorImageValue.h (modified) (2 diffs)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-30  Rick Byers  <rbyers@chromium.org>
+
+        cssText for cursor property doesn't include hotspot
+        https://bugs.webkit.org/show_bug.cgi?id=99530
+
+        Reviewed by Darin Adler.
+
+        Add simple test for parsing of CSS cursor property.
+
+        * fast/css/cursor-parsing-expected.txt: Added.
+        * fast/css/cursor-parsing.html: Added.
+
 2012-10-30  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-30  Rick Byers  <rbyers@chromium.org>
+
+        cssText for cursor property doesn't include hotspot
+        https://bugs.webkit.org/show_bug.cgi?id=99530
+
+        Reviewed by Darin Adler.
+
+        Implement customCssText in CSSCursorImageValue to include the hotspot when present.
+        Also explicitly track whether or not a hotspot was supplied in the parser,
+        while still using the existing convention of (-1,-1) to denote no hotspot
+        in the rest of the system.
+
+        Test: fast/css/cursor-parsing.html
+
+        * css/CSSCursorImageValue.cpp:
+        (WebCore::CSSCursorImageValue::customCssText):
+        * css/CSSCursorImageValue.h:
+        (CSSCursorImageValue):
+
 2012-10-30  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/css/CSSCursorImageValue.cpp

@@ -57 +57 @@
 #endif
 
-CSSCursorImageValue::CSSCursorImageValue(const String& url, const IntPoint& hotSpot)
+CSSCursorImageValue::CSSCursorImageValue(const String& url, bool hasHotSpot, const IntPoint& hotSpot)
     : CSSImageValue(CursorImageClass, url)
+    , m_hasHotSpot(hasHotSpot)
     , m_hotSpot(hotSpot)
 {
@@ -81 +82 @@
 }
 
+String CSSCursorImageValue::customCssText() const
+{
+    StringBuilder result;
+    result.append(CSSImageValue::customCssText());
+    if (m_hasHotSpot) {
+        result.append(' ');
+        result.appendNumber(m_hotSpot.x());
+        result.append(' ');
+        result.appendNumber(m_hotSpot.y());
+    }
+    return result.toString();
+}
+
 bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element)
 {
@@ -95 +109 @@
         // FIXME: This will override hot spot specified in CSS, which is probably incorrect.
         SVGLengthContext lengthContext(0);
+        m_hasHotSpot = true;
         float x = roundf(cursorElement->x().value(lengthContext));
         m_hotSpot.setX(static_cast<int>(x));

trunk/Source/WebCore/css/CSSCursorImageValue.h

@@ -33 +33 @@
 class CSSCursorImageValue : public CSSImageValue {
 public:
-    static PassRefPtr<CSSCursorImageValue> create(const String& url, const IntPoint& hotSpot)
+    static PassRefPtr<CSSCursorImageValue> create(const String& url, bool hasHotSpot, const IntPoint& hotSpot)
     {
-        return adoptRef(new CSSCursorImageValue(url, hotSpot));
+        return adoptRef(new CSSCursorImageValue(url, hasHotSpot, hotSpot));
     }
 
     ~CSSCursorImageValue();
 
-    IntPoint hotSpot() const { return m_hotSpot; }
+    bool hasHotSpot() const { return m_hasHotSpot; }
+
+    IntPoint hotSpot() const
+    {
+        if (m_hasHotSpot)
+            return m_hotSpot;
+        return IntPoint(-1, -1);
+    }
+
+    String customCssText() const;
 
     bool updateIfSVGCursorIsUsed(Element*);
@@ -52 +61 @@
 
 private:
-    CSSCursorImageValue(const String& url, const IntPoint& hotSpot);
+    CSSCursorImageValue(const String& url, bool hasHotSpot, const IntPoint& hotSpot);
 
+    bool m_hasHotSpot;
     IntPoint m_hotSpot;
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -1875 +1875 @@
                 value = m_valueList->next();
             }
+            bool hasHotSpot = false;
             IntPoint hotSpot(-1, -1);
             int nrcoords = coords.size();
             if (nrcoords > 0 && nrcoords != 2)
                 return false;
-            if (nrcoords == 2)
+            if (nrcoords == 2) {
+                hasHotSpot = true;
                 hotSpot = IntPoint(coords[0], coords[1]);
+            }
 
             if (!uri.isNull())
-                list->append(CSSCursorImageValue::create(completeURL(uri), hotSpot));
+                list->append(CSSCursorImageValue::create(completeURL(uri), hasHotSpot, hotSpot));
 
             if ((inStrictMode() && !value) || (value && !(value->unit == CSSParserValue::Operator && value->iValue == ',')))