Reviewed by Maciej.

        Bug 11442: [CSS 3] support for cursor: all-scroll
        http://bugs.webkit.org/show_bug.cgi?id=11442

        * css/CSSComputedStyleDeclaration.cpp:
        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
        * css/CSSValueKeywords.in:
        * css/cssparser.cpp:
        (WebCore::CSSParser::parseValue):
        * page/FrameView.cpp:
        (WebCore::selectCursor):
        * rendering/RenderStyle.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17493 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 29547463e8f033465e4007d83734b8faa0d48fc2..887a6a870126745f5a533d9f885d935d325e1b75 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2006-10-31  Lars Naesbye Christensen <larsnaesbye@stud.ku.dk>
+
+        Reviewed by Maciej.
+
+        Bug 11442: [CSS 3] support for cursor: all-scroll
+        http://bugs.webkit.org/show_bug.cgi?id=11442
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSValueKeywords.in:
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * page/FrameView.cpp:
+        (WebCore::selectCursor):
+        * rendering/RenderStyle.h:
+
 2006-10-31  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoff.

diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index ee0668d0a2028aec033b0da8e212970f995859fb..d4e82486c180b984cb0a61d5b6d643b2f0b637ea 100644 (file)
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -680,6 +680,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
                 break;
             case CURSOR_HELP:
                 value = new CSSPrimitiveValue(CSS_VAL_HELP);
+            case CURSOR_ALL_SCROLL:
+                value = new CSSPrimitiveValue(CSS_VAL_ALL_SCROLL);
+                break;
         }
         ASSERT(value);
         if (list) {

diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
index 9ff7de075e6dac5134f249e3a690c814ab5aea9c..b1125ed383829106dff38e66d077c85f97f16358 100644 (file)
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -283,6 +283,7 @@ row-resize
 text
 wait
 help
+all-scroll
 #
 # CSS_PROP_DIRECTION:
 #

diff --git a/WebCore/css/cssparser.cpp b/WebCore/css/cssparser.cpp
index 67b82951af8c1d7109ca9af2a76b38b848a3a3cd..60106867a1261cd30bd8791d5973bb43a476253f 100644 (file)
--- a/WebCore/css/cssparser.cpp
+++ b/WebCore/css/cssparser.cpp
@@ -746,7 +746,7 @@ bool CSSParser::parseValue(int propId, bool important)
                 }
             } else if (!strict && value->id == CSS_VAL_HAND) // MSIE 5 compatibility :/
                 list->append(new CSSPrimitiveValue(CSS_VAL_POINTER));
-            else if (value && value->id >= CSS_VAL_AUTO && value->id <= CSS_VAL_HELP)
+            else if (value && value->id >= CSS_VAL_AUTO && value->id <= CSS_VAL_ALL_SCROLL)
                 list->append(new CSSPrimitiveValue(value->id));
             valueList->next();
             parsedValue = list;
@@ -756,7 +756,7 @@ bool CSSParser::parseValue(int propId, bool important)
         if (!strict && value->id == CSS_VAL_HAND) { // MSIE 5 compatibility :/
             id = CSS_VAL_POINTER;
             valid_primitive = true;
-        } else if (value->id >= CSS_VAL_AUTO && value->id <= CSS_VAL_HELP)
+        } else if (value->id >= CSS_VAL_AUTO && value->id <= CSS_VAL_ALL_SCROLL)
             valid_primitive = true;
         break;
     }

diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 1a59b104bb32f16a2dfcd3ba8debcb1076623c7c..757d2adca2cbb1ddc3c48c4ef4e22e0d190b6e30 100644 (file)
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -753,6 +753,8 @@ static Cursor selectCursor(const MouseEventWithHitTestResults& event, Frame* fra
             return handCursor();
         case CURSOR_MOVE:
             return moveCursor();
+        case CURSOR_ALL_SCROLL:
+            return moveCursor();
         case CURSOR_E_RESIZE:
             return eastResizeCursor();
         case CURSOR_W_RESIZE:

diff --git a/WebCore/rendering/RenderStyle.h b/WebCore/rendering/RenderStyle.h
index 9232abda9e36e28a7b89faa0a7f3856f6d3fb9fc..361adbde1b92164ef1d2830b491f350dd2925225 100644 (file)
--- a/WebCore/rendering/RenderStyle.h
+++ b/WebCore/rendering/RenderStyle.h
@@ -873,7 +873,7 @@ enum ECursor {
     CURSOR_AUTO, CURSOR_CROSS, CURSOR_DEFAULT, CURSOR_POINTER, CURSOR_MOVE,
     CURSOR_E_RESIZE, CURSOR_NE_RESIZE, CURSOR_NW_RESIZE, CURSOR_N_RESIZE, CURSOR_SE_RESIZE, CURSOR_SW_RESIZE,
     CURSOR_S_RESIZE, CURSOR_W_RESIZE, CURSOR_EW_RESIZE, CURSOR_NS_RESIZE, CURSOR_NESW_RESIZE, CURSOR_NWSE_RESIZE,
-    CURSOR_COL_RESIZE, CURSOR_ROW_RESIZE, CURSOR_TEXT, CURSOR_WAIT, CURSOR_HELP
+    CURSOR_COL_RESIZE, CURSOR_ROW_RESIZE, CURSOR_TEXT, CURSOR_WAIT, CURSOR_HELP, CURSOR_ALL_SCROLL
 };
 
 struct CursorData {