Changeset 91170 in webkit

Timestamp:

Jul 17, 2011 6:59:55 PM (13 years ago)

Author:

macpherson@chromium.org

Message:

Implement CSSPropertyCursor in CSSStyleApplyProperty
​https://bugs.webkit.org/show_bug.cgi?id=64432

Reviewed by Dimitri Glazkov.

No new tests / refectoring only.

• css/CSSStyleApplyProperty.cpp:

Add handler for CSSPropertyCursor.

• css/CSSStyleSelector.cpp:

Remove current handler of CSSPropertyCursor.

• css/CSSStyleSelector.h:

Make styleImage and cachedOrPendingFromValue public.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleApplyProperty.cpp (modified) (3 diffs)
• css/CSSStyleSelector.cpp (modified) (2 diffs)
• css/CSSStyleSelector.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-17  Luke Macpherson   <macpherson@chromium.org>
+
+        Implement CSSPropertyCursor in CSSStyleApplyProperty
+        https://bugs.webkit.org/show_bug.cgi?id=64432
+
+        Reviewed by Dimitri Glazkov.
+
+        No new tests / refectoring only.
+
+        * css/CSSStyleApplyProperty.cpp:
+        Add handler for CSSPropertyCursor.
+        * css/CSSStyleSelector.cpp:
+        Remove current handler of CSSPropertyCursor.
+        * css/CSSStyleSelector.h:
+        Make styleImage and cachedOrPendingFromValue public.
+
 2011-07-16  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -26 +26 @@
 #include "CSSStyleApplyProperty.h"
 
+#include "CSSCursorImageValue.h"
 #include "CSSPrimitiveValueMappings.h"
 #include "CSSStyleSelector.h"
 #include "CSSValueList.h"
+#include "CursorList.h"
 #include "Document.h"
 #include "Element.h"
@@ -505 +507 @@
 };
 
+class ApplyPropertyCursor : public ApplyPropertyBase {
+private:
+    virtual void applyInheritValue(CSSStyleSelector* selector) const
+    {
+        selector->style()->setCursor(selector->parentStyle()->cursor());
+        selector->style()->setCursorList(selector->parentStyle()->cursors());
+    }
+
+    virtual void applyInitialValue(CSSStyleSelector* selector) const
+    {
+        selector->style()->clearCursorList();
+        selector->style()->setCursor(RenderStyle::initialCursor());
+    }
+
+    virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
+    {
+        selector->style()->clearCursorList();
+        if (value->isValueList()) {
+            CSSValueList* list = static_cast<CSSValueList*>(value);
+            int len = list->length();
+            selector->style()->setCursor(CURSOR_AUTO);
+            for (int i = 0; i < len; i++) {
+                CSSValue* item = list->itemWithoutBoundsCheck(i);
+                if (!item->isPrimitiveValue())
+                    continue;
+                CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(item);
+                int type = primitiveValue->primitiveType();
+                if (type == CSSPrimitiveValue::CSS_URI) {
+                    if (primitiveValue->isCursorImageValue()) {
+                        CSSCursorImageValue* image = static_cast<CSSCursorImageValue*>(primitiveValue);
+                        if (image->updateIfSVGCursorIsUsed(selector->element())) // Elements with SVG cursors are not allowed to share style.
+                            selector->style()->setUnique();
+                        selector->style()->addCursor(selector->cachedOrPendingFromValue(CSSPropertyCursor, image), image->hotSpot());
+                    }
+                } else if (type == CSSPrimitiveValue::CSS_IDENT)
+                    selector->style()->setCursor(*primitiveValue);
+            }
+        } else if (value->isPrimitiveValue()) {
+            CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
+            int type = primitiveValue->primitiveType();
+            if (type == CSSPrimitiveValue::CSS_IDENT && selector->style()->cursor() != ECursor(*primitiveValue))
+                selector->style()->setCursor(*primitiveValue);
+        }
+    }
+};
+
 const CSSStyleApplyProperty& CSSStyleApplyProperty::sharedCSSStyleApplyProperty()
 {
@@ -619 +667 @@
     setPropertyHandler(CSSPropertyWordSpacing, new ApplyPropertyComputeLength<int, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>(&RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLetterWordSpacing));
 
+    setPropertyHandler(CSSPropertyCursor, new ApplyPropertyCursor());
+
     setPropertyHandler(CSSPropertyFontStyle, new ApplyPropertyFont<FontItalic>(&FontDescription::italic, &FontDescription::setItalic, FontItalicOff));
     setPropertyHandler(CSSPropertyFontVariant, new ApplyPropertyFont<FontSmallCaps>(&FontDescription::smallCaps, &FontDescription::setSmallCaps, FontSmallCapsOff));

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3814 +3814 @@
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(whiteSpace, WhiteSpace)
         return;
-    case CSSPropertyCursor:
-        if (isInherit) {
-            m_style->setCursor(m_parentStyle->cursor());
-            m_style->setCursorList(m_parentStyle->cursors());
-            return;
-        }
-        m_style->clearCursorList();
-        if (isInitial) {
-            m_style->setCursor(RenderStyle::initialCursor());
-            return;
-        }
-        if (value->isValueList()) {
-            CSSValueList* list = static_cast<CSSValueList*>(value);
-            int len = list->length();
-            m_style->setCursor(CURSOR_AUTO);
-            for (int i = 0; i < len; i++) {
-                CSSValue* item = list->itemWithoutBoundsCheck(i);
-                if (!item->isPrimitiveValue())
-                    continue;
-                primitiveValue = static_cast<CSSPrimitiveValue*>(item);
-                int type = primitiveValue->primitiveType();
-                if (type == CSSPrimitiveValue::CSS_URI) {
-                    if (primitiveValue->isCursorImageValue()) {
-                        CSSCursorImageValue* image = static_cast<CSSCursorImageValue*>(primitiveValue);
-                        if (image->updateIfSVGCursorIsUsed(m_element)) // Elements with SVG cursors are not allowed to share style.
-                            m_style->setUnique();
-                        m_style->addCursor(cachedOrPendingFromValue(CSSPropertyCursor, image), image->hotSpot());
-                    }
-                } else if (type == CSSPrimitiveValue::CSS_IDENT)
-                    m_style->setCursor(*primitiveValue);
-            }
-        } else if (primitiveValue) {
-            int type = primitiveValue->primitiveType();
-            if (type == CSSPrimitiveValue::CSS_IDENT && m_style->cursor() != ECursor(*primitiveValue))
-                m_style->setCursor(*primitiveValue);
-        }
-        return;
-    
 // uri || inherit
     case CSSPropertyListStyleImage:
@@ -5429 +5391 @@
     case CSSPropertyWebkitPerspectiveOriginX:
     case CSSPropertyWebkitPerspectiveOriginY:
+    case CSSPropertyCursor:
         ASSERT_NOT_REACHED();
         return;

trunk/Source/WebCore/css/CSSStyleSelector.h

@@ -305 +305 @@
         };
 
+        StyleImage* styleImage(CSSPropertyID, CSSValue*);
+        StyleImage* cachedOrPendingFromValue(CSSPropertyID, CSSImageValue*);
+
     private:
         static RenderStyle* s_styleNotYetAvailable;
@@ -347 +350 @@
 
         void loadPendingImages();
-        
-        StyleImage* styleImage(CSSPropertyID, CSSValue* value);
-        StyleImage* cachedOrPendingFromValue(CSSPropertyID property, CSSImageValue* value);
 
         // We collect the set of decls that match in |m_matchedDecls|.  We then walk the