Diff
Modified: trunk/LayoutTests/ChangeLog (173988 => 173989)
--- trunk/LayoutTests/ChangeLog 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/LayoutTests/ChangeLog 2014-09-26 01:00:56 UTC (rev 173989)
@@ -1,3 +1,15 @@
+2014-09-25 Sungmann Cho <[email protected]>
+
+ Unprefix CSS cursor values zoom-in and zoom-out.
+ https://bugs.webkit.org/show_bug.cgi?id=137061
+
+ Reviewed by Benjamin Poulain.
+
+ Add test cases for zoom-in, zoom-out, -webkit-zoom-in, -webkit-zoom-out.
+
+ * fast/css/cursor-parsing-expected.txt:
+ * fast/css/cursor-parsing.html:
+
2014-09-25 Roger Fong <[email protected]>
Unreviewed. Skip quicktime-plugin-snapshotted.html
Modified: trunk/LayoutTests/fast/css/cursor-parsing-expected.txt (173988 => 173989)
--- trunk/LayoutTests/fast/css/cursor-parsing-expected.txt 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/LayoutTests/fast/css/cursor-parsing-expected.txt 2014-09-26 01:00:56 UTC (rev 173989)
@@ -7,7 +7,11 @@
PASS roundtripCssRule("cursor: auto;") is "cursor: auto;"
PASS roundtripCssRule("cursor: none;") is "cursor: none;"
PASS roundtripCssRule("cursor: copy;") is "cursor: copy;"
+PASS roundtripCssRule("cursor: zoom-in;") is "cursor: zoom-in;"
+PASS roundtripCssRule("cursor: zoom-out;") is "cursor: zoom-out;"
PASS roundtripCssRule("cursor: -webkit-grabbing;") is "cursor: -webkit-grabbing;"
+PASS roundtripCssRule("cursor: -webkit-zoom-in;") is "cursor: -webkit-zoom-in;"
+PASS roundtripCssRule("cursor: -webkit-zoom-out;") is "cursor: -webkit-zoom-out;"
PASS roundtripCssRule("cursor: url(file:///foo.png);") is "cursor: url(file:///foo.png);"
PASS roundtripCssRule("cursor: url(file:///foo.png), crosshair;") is "cursor: url(file:///foo.png), crosshair;"
PASS roundtripCssRule("cursor: url(file:///foo.png), url(file:///foo2.png), pointer;") is "cursor: url(file:///foo.png), url(file:///foo2.png), pointer;"
Modified: trunk/LayoutTests/fast/css/cursor-parsing.html (173988 => 173989)
--- trunk/LayoutTests/fast/css/cursor-parsing.html 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/LayoutTests/fast/css/cursor-parsing.html 2014-09-26 01:00:56 UTC (rev 173989)
@@ -43,7 +43,11 @@
testCursorRule('auto');
testCursorRule('none');
testCursorRule('copy');
+testCursorRule('zoom-in');
+testCursorRule('zoom-out');
testCursorRule('-webkit-grabbing');
+testCursorRule('-webkit-zoom-in');
+testCursorRule('-webkit-zoom-out');
testCursorRule('url(file:///foo.png)'); // IE compatibility
testCursorRule('url(file:///foo.png), crosshair');
testCursorRule('url(file:///foo.png), url(file:///foo2.png), pointer');
Modified: trunk/Source/WebCore/ChangeLog (173988 => 173989)
--- trunk/Source/WebCore/ChangeLog 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/ChangeLog 2014-09-26 01:00:56 UTC (rev 173989)
@@ -1,3 +1,31 @@
+2014-09-25 Sungmann Cho <[email protected]>
+
+ Unprefix CSS cursor values zoom-in and zoom-out.
+ https://bugs.webkit.org/show_bug.cgi?id=137061
+
+ Reviewed by Benjamin Poulain.
+
+ This patch unprefixes CSS cursor values zoom-in and zoom-out.
+ -webkit-zoom-in and -webkit-zoom-out are kept as aliases.
+ ECursor members use InterCaps with an initial capital letter for now.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator ECursor):
+ * css/CSSValueKeywords.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyCursor::applyValue):
+ * html/ImageDocument.cpp:
+ (WebCore::ImageDocument::resizeImageToFit):
+ (WebCore::ImageDocument::restoreImageSize):
+ (WebCore::ImageDocument::windowSizeChanged):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::selectCursor):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+
2014-09-25 Brent Fulgham <[email protected]>
[Win] Debug builds of TestWebKitAPI are crashing.
Modified: trunk/Source/WebCore/css/CSSParser.cpp (173988 => 173989)
--- trunk/Source/WebCore/css/CSSParser.cpp 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-09-26 01:00:56 UTC (rev 173989)
@@ -1980,8 +1980,9 @@
// [ auto | crosshair | default | pointer | progress | move | e-resize | ne-resize |
// nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | ew-resize |
// ns-resize | nesw-resize | nwse-resize | col-resize | row-resize | text | wait | help |
- // vertical-text | cell | context-menu | alias | copy | no-drop | not-allowed | -webkit-zoom-in
- // -webkit-zoom-out | all-scroll | -webkit-grab | -webkit-grabbing ] ] | inherit
+ // vertical-text | cell | context-menu | alias | copy | no-drop | not-allowed |
+ // zoom-in | zoom-out | all-scroll | -webkit-grab | -webkit-grabbing | -webkit-zoom-in |
+ // -webkit-zoom-out ] ] | inherit
RefPtr<CSSValueList> list;
while (value) {
RefPtr<CSSValue> image = 0;
@@ -2030,7 +2031,7 @@
return false;
} else if (inQuirksMode() && value->id == CSSValueHand) // MSIE 5 compatibility :/
list->append(cssValuePool().createIdentifierValue(CSSValuePointer));
- else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitGrabbing) || value->id == CSSValueCopy || value->id == CSSValueNone)
+ else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone)
list->append(cssValuePool().createIdentifierValue(value->id));
m_valueList->next();
parsedValue = list.release();
@@ -2040,7 +2041,7 @@
if (inQuirksMode() && value->id == CSSValueHand) { // MSIE 5 compatibility :/
id = CSSValuePointer;
validPrimitive = true;
- } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitGrabbing) || value->id == CSSValueCopy || value->id == CSSValueNone)
+ } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone)
validPrimitive = true;
} else {
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (173988 => 173989)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-09-26 01:00:56 UTC (rev 173989)
@@ -1146,112 +1146,112 @@
{
m_primitiveUnitType = CSS_VALUE_ID;
switch (e) {
- case CURSOR_AUTO:
+ case CursorAuto:
m_value.valueID = CSSValueAuto;
break;
- case CURSOR_CROSS:
+ case CursorCross:
m_value.valueID = CSSValueCrosshair;
break;
- case CURSOR_DEFAULT:
+ case CursorDefault:
m_value.valueID = CSSValueDefault;
break;
- case CURSOR_POINTER:
+ case CursorPointer:
m_value.valueID = CSSValuePointer;
break;
- case CURSOR_MOVE:
+ case CursorMove:
m_value.valueID = CSSValueMove;
break;
- case CURSOR_CELL:
+ case CursorCell:
m_value.valueID = CSSValueCell;
break;
- case CURSOR_VERTICAL_TEXT:
+ case CursorVerticalText:
m_value.valueID = CSSValueVerticalText;
break;
- case CURSOR_CONTEXT_MENU:
+ case CursorContextMenu:
m_value.valueID = CSSValueContextMenu;
break;
- case CURSOR_ALIAS:
+ case CursorAlias:
m_value.valueID = CSSValueAlias;
break;
- case CURSOR_COPY:
+ case CursorCopy:
m_value.valueID = CSSValueCopy;
break;
- case CURSOR_NONE:
+ case CursorNone:
m_value.valueID = CSSValueNone;
break;
- case CURSOR_PROGRESS:
+ case CursorProgress:
m_value.valueID = CSSValueProgress;
break;
- case CURSOR_NO_DROP:
+ case CursorNoDrop:
m_value.valueID = CSSValueNoDrop;
break;
- case CURSOR_NOT_ALLOWED:
+ case CursorNotAllowed:
m_value.valueID = CSSValueNotAllowed;
break;
- case CURSOR_WEBKIT_ZOOM_IN:
- m_value.valueID = CSSValueWebkitZoomIn;
+ case CursorZoomIn:
+ m_value.valueID = CSSValueZoomIn;
break;
- case CURSOR_WEBKIT_ZOOM_OUT:
- m_value.valueID = CSSValueWebkitZoomOut;
+ case CursorZoomOut:
+ m_value.valueID = CSSValueZoomOut;
break;
- case CURSOR_E_RESIZE:
+ case CursorEResize:
m_value.valueID = CSSValueEResize;
break;
- case CURSOR_NE_RESIZE:
+ case CursorNeResize:
m_value.valueID = CSSValueNeResize;
break;
- case CURSOR_NW_RESIZE:
+ case CursorNwResize:
m_value.valueID = CSSValueNwResize;
break;
- case CURSOR_N_RESIZE:
+ case CursorNResize:
m_value.valueID = CSSValueNResize;
break;
- case CURSOR_SE_RESIZE:
+ case CursorSeResize:
m_value.valueID = CSSValueSeResize;
break;
- case CURSOR_SW_RESIZE:
+ case CursorSwResize:
m_value.valueID = CSSValueSwResize;
break;
- case CURSOR_S_RESIZE:
+ case CursorSResize:
m_value.valueID = CSSValueSResize;
break;
- case CURSOR_W_RESIZE:
+ case CursorWResize:
m_value.valueID = CSSValueWResize;
break;
- case CURSOR_EW_RESIZE:
+ case CursorEwResize:
m_value.valueID = CSSValueEwResize;
break;
- case CURSOR_NS_RESIZE:
+ case CursorNsResize:
m_value.valueID = CSSValueNsResize;
break;
- case CURSOR_NESW_RESIZE:
+ case CursorNeswResize:
m_value.valueID = CSSValueNeswResize;
break;
- case CURSOR_NWSE_RESIZE:
+ case CursorNwseResize:
m_value.valueID = CSSValueNwseResize;
break;
- case CURSOR_COL_RESIZE:
+ case CursorColResize:
m_value.valueID = CSSValueColResize;
break;
- case CURSOR_ROW_RESIZE:
+ case CursorRowResize:
m_value.valueID = CSSValueRowResize;
break;
- case CURSOR_TEXT:
+ case CursorText:
m_value.valueID = CSSValueText;
break;
- case CURSOR_WAIT:
+ case CursorWait:
m_value.valueID = CSSValueWait;
break;
- case CURSOR_HELP:
+ case CursorHelp:
m_value.valueID = CSSValueHelp;
break;
- case CURSOR_ALL_SCROLL:
+ case CursorAllScroll:
m_value.valueID = CSSValueAllScroll;
break;
- case CURSOR_WEBKIT_GRAB:
+ case CursorWebkitGrab:
m_value.valueID = CSSValueWebkitGrab;
break;
- case CURSOR_WEBKIT_GRABBING:
+ case CursorWebkitGrabbing:
m_value.valueID = CSSValueWebkitGrabbing;
break;
}
@@ -1260,15 +1260,20 @@
template<> inline CSSPrimitiveValue::operator ECursor() const
{
ASSERT(isValueID());
-
- if (m_value.valueID == CSSValueCopy)
- return CURSOR_COPY;
- if (m_value.valueID == CSSValueNone)
- return CURSOR_NONE;
- return static_cast<ECursor>(m_value.valueID - CSSValueAuto);
+ switch (m_value.valueID) {
+ case CSSValueCopy:
+ return CursorCopy;
+ case CSSValueWebkitZoomIn:
+ return CursorZoomIn;
+ case CSSValueWebkitZoomOut:
+ return CursorZoomOut;
+ case CSSValueNone:
+ return CursorNone;
+ default:
+ return static_cast<ECursor>(m_value.valueID - CSSValueAuto);
+ }
}
-
#if ENABLE(CURSOR_VISIBILITY)
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CursorVisibility e)
: CSSValue(PrimitiveClass)
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (173988 => 173989)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-09-26 01:00:56 UTC (rev 173989)
@@ -383,8 +383,8 @@
progress
no-drop
not-allowed
--webkit-zoom-in
--webkit-zoom-out
+zoom-in
+zoom-out
e-resize
ne-resize
nw-resize
@@ -405,6 +405,8 @@
all-scroll
-webkit-grab
-webkit-grabbing
+-webkit-zoom-in
+-webkit-zoom-out
// none
//
// CSS_PROP_CURSOR_VISIBILITY:
Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (173988 => 173989)
--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-09-26 01:00:56 UTC (rev 173989)
@@ -1222,7 +1222,7 @@
if (value->isValueList()) {
CSSValueList* list = toCSSValueList(value);
int len = list->length();
- styleResolver->style()->setCursor(CURSOR_AUTO);
+ styleResolver->style()->setCursor(CursorAuto);
for (int i = 0; i < len; i++) {
CSSValue* item = list->itemWithoutBoundsCheck(i);
if (item->isCursorImageValue()) {
Modified: trunk/Source/WebCore/html/ImageDocument.cpp (173988 => 173989)
--- trunk/Source/WebCore/html/ImageDocument.cpp 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/html/ImageDocument.cpp 2014-09-26 01:00:56 UTC (rev 173989)
@@ -301,7 +301,7 @@
m_imageElement->setWidth(static_cast<int>(imageSize.width() * scale));
m_imageElement->setHeight(static_cast<int>(imageSize.height() * scale));
- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomIn);
+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomIn);
}
void ImageDocument::restoreImageSize()
@@ -316,7 +316,7 @@
if (imageFitsInWindow())
m_imageElement->removeInlineStyleProperty(CSSPropertyCursor);
else
- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomOut);
+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomOut);
m_didShrinkImage = false;
}
@@ -349,7 +349,7 @@
if (fitsInWindow)
m_imageElement->removeInlineStyleProperty(CSSPropertyCursor);
else
- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomOut);
+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomOut);
return;
}
Modified: trunk/Source/WebCore/page/EventHandler.cpp (173988 => 173989)
--- trunk/Source/WebCore/page/EventHandler.cpp 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-09-26 01:00:56 UTC (rev 173989)
@@ -1435,8 +1435,8 @@
&& !m_capturingMouseEventsElement)
return iBeam;
- switch (style ? style->cursor() : CURSOR_AUTO) {
- case CURSOR_AUTO: {
+ switch (style ? style->cursor() : CursorAuto) {
+ case CursorAuto: {
bool editable = node->hasEditableStyle();
if (useHandCursor(node, result.isOverLink(), shiftKey))
@@ -1454,75 +1454,75 @@
return iBeam;
return pointerCursor();
}
- case CURSOR_CROSS:
+ case CursorCross:
return crossCursor();
- case CURSOR_POINTER:
+ case CursorPointer:
return handCursor();
- case CURSOR_MOVE:
+ case CursorMove:
return moveCursor();
- case CURSOR_ALL_SCROLL:
+ case CursorAllScroll:
return moveCursor();
- case CURSOR_E_RESIZE:
+ case CursorEResize:
return eastResizeCursor();
- case CURSOR_W_RESIZE:
+ case CursorWResize:
return westResizeCursor();
- case CURSOR_N_RESIZE:
+ case CursorNResize:
return northResizeCursor();
- case CURSOR_S_RESIZE:
+ case CursorSResize:
return southResizeCursor();
- case CURSOR_NE_RESIZE:
+ case CursorNeResize:
return northEastResizeCursor();
- case CURSOR_SW_RESIZE:
+ case CursorSwResize:
return southWestResizeCursor();
- case CURSOR_NW_RESIZE:
+ case CursorNwResize:
return northWestResizeCursor();
- case CURSOR_SE_RESIZE:
+ case CursorSeResize:
return southEastResizeCursor();
- case CURSOR_NS_RESIZE:
+ case CursorNsResize:
return northSouthResizeCursor();
- case CURSOR_EW_RESIZE:
+ case CursorEwResize:
return eastWestResizeCursor();
- case CURSOR_NESW_RESIZE:
+ case CursorNeswResize:
return northEastSouthWestResizeCursor();
- case CURSOR_NWSE_RESIZE:
+ case CursorNwseResize:
return northWestSouthEastResizeCursor();
- case CURSOR_COL_RESIZE:
+ case CursorColResize:
return columnResizeCursor();
- case CURSOR_ROW_RESIZE:
+ case CursorRowResize:
return rowResizeCursor();
- case CURSOR_TEXT:
+ case CursorText:
return iBeamCursor();
- case CURSOR_WAIT:
+ case CursorWait:
return waitCursor();
- case CURSOR_HELP:
+ case CursorHelp:
return helpCursor();
- case CURSOR_VERTICAL_TEXT:
+ case CursorVerticalText:
return verticalTextCursor();
- case CURSOR_CELL:
+ case CursorCell:
return cellCursor();
- case CURSOR_CONTEXT_MENU:
+ case CursorContextMenu:
return contextMenuCursor();
- case CURSOR_PROGRESS:
+ case CursorProgress:
return progressCursor();
- case CURSOR_NO_DROP:
+ case CursorNoDrop:
return noDropCursor();
- case CURSOR_ALIAS:
+ case CursorAlias:
return aliasCursor();
- case CURSOR_COPY:
+ case CursorCopy:
return copyCursor();
- case CURSOR_NONE:
+ case CursorNone:
return noneCursor();
- case CURSOR_NOT_ALLOWED:
+ case CursorNotAllowed:
return notAllowedCursor();
- case CURSOR_DEFAULT:
+ case CursorDefault:
return pointerCursor();
- case CURSOR_WEBKIT_ZOOM_IN:
+ case CursorZoomIn:
return zoomInCursor();
- case CURSOR_WEBKIT_ZOOM_OUT:
+ case CursorZoomOut:
return zoomOutCursor();
- case CURSOR_WEBKIT_GRAB:
+ case CursorWebkitGrab:
return grabCursor();
- case CURSOR_WEBKIT_GRABBING:
+ case CursorWebkitGrabbing:
return grabbingCursor();
}
return pointerCursor();
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (173988 => 173989)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-09-26 01:00:56 UTC (rev 173989)
@@ -1800,7 +1800,7 @@
static EWhiteSpace initialWhiteSpace() { return NORMAL; }
static short initialHorizontalBorderSpacing() { return 0; }
static short initialVerticalBorderSpacing() { return 0; }
- static ECursor initialCursor() { return CURSOR_AUTO; }
+ static ECursor initialCursor() { return CursorAuto; }
#if ENABLE(CURSOR_VISIBILITY)
static CursorVisibility initialCursorVisibility() { return CursorVisibilityAuto; }
#endif
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (173988 => 173989)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-09-26 01:00:56 UTC (rev 173989)
@@ -420,44 +420,44 @@
enum ECursor {
// The following must match the order in CSSValueKeywords.in.
- 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_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_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_WEBKIT_GRAB,
- CURSOR_WEBKIT_GRABBING,
+ CursorAuto,
+ CursorCross,
+ CursorDefault,
+ CursorPointer,
+ CursorMove,
+ CursorVerticalText,
+ CursorCell,
+ CursorContextMenu,
+ CursorAlias,
+ CursorProgress,
+ CursorNoDrop,
+ CursorNotAllowed,
+ CursorZoomIn,
+ CursorZoomOut,
+ CursorEResize,
+ CursorNeResize,
+ CursorNwResize,
+ CursorNResize,
+ CursorSeResize,
+ CursorSwResize,
+ CursorSResize,
+ CursorWResize,
+ CursorEwResize,
+ CursorNsResize,
+ CursorNeswResize,
+ CursorNwseResize,
+ CursorColResize,
+ CursorRowResize,
+ CursorText,
+ CursorWait,
+ CursorHelp,
+ CursorAllScroll,
+ CursorWebkitGrab,
+ CursorWebkitGrabbing,
// The following are handled as exceptions so don't need to match.
- CURSOR_COPY,
- CURSOR_NONE
+ CursorCopy,
+ CursorNone
};
#if ENABLE(CURSOR_VISIBILITY)
