Commit 1500e83b authored by andersca's avatar andersca
Browse files

Reviewed by Darin.

        Add -webkit-zoom-in and -webkit-zoom-out cursors.
        
        * Resources/zoomInCursor.png: Added.
        * Resources/zoomOutCursor.png: Added.
        * css/CSSComputedStyleDeclaration.cpp:
        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
        * css/CSSValueKeywords.in:
        * page/EventHandler.cpp:
        (WebCore::selectCursor):
        * platform/Cursor.h:
        * platform/mac/CursorMac.mm:
        (WebCore::zoomInCursor):
        (WebCore::zoomOutCursor):
        * rendering/RenderStyle.h:
        (WebCore::):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@21685 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6f17861a
2007-05-23 Anders Carlsson <andersca@apple.com>
Reviewed by Darin.
Add -webkit-zoom-in and -webkit-zoom-out cursors.
* Resources/zoomInCursor.png: Added.
* Resources/zoomOutCursor.png: Added.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* css/CSSValueKeywords.in:
* page/EventHandler.cpp:
(WebCore::selectCursor):
* platform/Cursor.h:
* platform/mac/CursorMac.mm:
(WebCore::zoomInCursor):
(WebCore::zoomOutCursor):
* rendering/RenderStyle.h:
(WebCore::):
2007-05-23 Sam Weinig <sam@webkit.org> 2007-05-23 Sam Weinig <sam@webkit.org>
   
Reviewed by Darin. Reviewed by Darin.
...@@ -824,6 +824,12 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper ...@@ -824,6 +824,12 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
case CURSOR_NOT_ALLOWED: case CURSOR_NOT_ALLOWED:
value = new CSSPrimitiveValue(CSS_VAL_NOT_ALLOWED); value = new CSSPrimitiveValue(CSS_VAL_NOT_ALLOWED);
break; break;
case CURSOR_WEBKIT_ZOOM_IN:
value = new CSSPrimitiveValue(CSS_VAL__WEBKIT_ZOOM_IN);
break;
case CURSOR_WEBKIT_ZOOM_OUT:
value = new CSSPrimitiveValue(CSS_VAL__WEBKIT_ZOOM_OUT);
break;
case CURSOR_E_RESIZE: case CURSOR_E_RESIZE:
value = new CSSPrimitiveValue(CSS_VAL_E_RESIZE); value = new CSSPrimitiveValue(CSS_VAL_E_RESIZE);
break; break;
......
...@@ -274,6 +274,8 @@ alias ...@@ -274,6 +274,8 @@ alias
progress progress
no-drop no-drop
not-allowed not-allowed
-webkit-zoom-in
-webkit-zoom-out
e-resize e-resize
ne-resize ne-resize
nw-resize nw-resize
......
...@@ -757,6 +757,10 @@ static Cursor selectCursor(const MouseEventWithHitTestResults& event, Frame* fra ...@@ -757,6 +757,10 @@ static Cursor selectCursor(const MouseEventWithHitTestResults& event, Frame* fra
return notAllowedCursor(); return notAllowedCursor();
case CURSOR_DEFAULT: case CURSOR_DEFAULT:
return pointerCursor(); return pointerCursor();
case CURSOR_WEBKIT_ZOOM_IN:
return zoomInCursor();
case CURSOR_WEBKIT_ZOOM_OUT:
return zoomOutCursor();
} }
return pointerCursor(); return pointerCursor();
} }
......
...@@ -110,6 +110,8 @@ namespace WebCore { ...@@ -110,6 +110,8 @@ namespace WebCore {
const Cursor& notAllowedCursor(); const Cursor& notAllowedCursor();
const Cursor& progressCursor(); const Cursor& progressCursor();
const Cursor& aliasCursor(); const Cursor& aliasCursor();
const Cursor& zoomInCursor();
const Cursor& zoomOutCursor();
const Cursor& copyCursor(); const Cursor& copyCursor();
const Cursor& noneCursor(); const Cursor& noneCursor();
......
...@@ -151,6 +151,18 @@ const Cursor& aliasCursor() ...@@ -151,6 +151,18 @@ const Cursor& aliasCursor()
return c; return c;
} }
const Cursor& zoomInCursor()
{
static Cursor c = leakNamedCursor("zoomInCursor", 7, 7);
return c;
}
const Cursor& zoomOutCursor()
{
static Cursor c = leakNamedCursor("zoomOutCursor", 7, 7);
return c;
}
const Cursor& copyCursor() const Cursor& copyCursor()
{ {
static Cursor c = leakNamedCursor("copyCursor", 3, 2); static Cursor c = leakNamedCursor("copyCursor", 3, 2);
......
...@@ -962,7 +962,7 @@ enum EVisibility { VISIBLE, HIDDEN, COLLAPSE }; ...@@ -962,7 +962,7 @@ enum EVisibility { VISIBLE, HIDDEN, COLLAPSE };
enum ECursor { enum ECursor {
CURSOR_AUTO, CURSOR_CROSS, CURSOR_DEFAULT, CURSOR_POINTER, CURSOR_MOVE, CURSOR_VERTICAL_TEXT, CURSOR_CELL, CURSOR_CONTEXT_MENU, CURSOR_AUTO, CURSOR_CROSS, CURSOR_DEFAULT, CURSOR_POINTER, CURSOR_MOVE, CURSOR_VERTICAL_TEXT, CURSOR_CELL, CURSOR_CONTEXT_MENU,
CURSOR_ALIAS, CURSOR_PROGRESS, CURSOR_NO_DROP, CURSOR_NOT_ALLOWED, CURSOR_ALIAS, CURSOR_PROGRESS, CURSOR_NO_DROP, CURSOR_NOT_ALLOWED, CURSOR_WEBKIT_ZOOM_IN, CURSOR_WEBKIT_ZOOM_OUT,
CURSOR_E_RESIZE, CURSOR_NE_RESIZE, CURSOR_NW_RESIZE, CURSOR_N_RESIZE, CURSOR_SE_RESIZE, CURSOR_SW_RESIZE, 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_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_ALL_SCROLL, CURSOR_COL_RESIZE, CURSOR_ROW_RESIZE, CURSOR_TEXT, CURSOR_WAIT, CURSOR_HELP, CURSOR_ALL_SCROLL,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment