Changeset 173989 in webkit
- Timestamp:
- Sep 25, 2014 6:00:56 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r173985 r173989 1 2014-09-25 Sungmann Cho <sungmann.cho@navercorp.com> 2 3 Unprefix CSS cursor values zoom-in and zoom-out. 4 https://bugs.webkit.org/show_bug.cgi?id=137061 5 6 Reviewed by Benjamin Poulain. 7 8 Add test cases for zoom-in, zoom-out, -webkit-zoom-in, -webkit-zoom-out. 9 10 * fast/css/cursor-parsing-expected.txt: 11 * fast/css/cursor-parsing.html: 12 1 13 2014-09-25 Roger Fong <roger_fong@apple.com> 2 14 -
trunk/LayoutTests/fast/css/cursor-parsing-expected.txt
r132966 r173989 8 8 PASS roundtripCssRule("cursor: none;") is "cursor: none;" 9 9 PASS roundtripCssRule("cursor: copy;") is "cursor: copy;" 10 PASS roundtripCssRule("cursor: zoom-in;") is "cursor: zoom-in;" 11 PASS roundtripCssRule("cursor: zoom-out;") is "cursor: zoom-out;" 10 12 PASS roundtripCssRule("cursor: -webkit-grabbing;") is "cursor: -webkit-grabbing;" 13 PASS roundtripCssRule("cursor: -webkit-zoom-in;") is "cursor: -webkit-zoom-in;" 14 PASS roundtripCssRule("cursor: -webkit-zoom-out;") is "cursor: -webkit-zoom-out;" 11 15 PASS roundtripCssRule("cursor: url(file:///foo.png);") is "cursor: url(file:///foo.png);" 12 16 PASS roundtripCssRule("cursor: url(file:///foo.png), crosshair;") is "cursor: url(file:///foo.png), crosshair;" -
trunk/LayoutTests/fast/css/cursor-parsing.html
r155263 r173989 44 44 testCursorRule('none'); 45 45 testCursorRule('copy'); 46 testCursorRule('zoom-in'); 47 testCursorRule('zoom-out'); 46 48 testCursorRule('-webkit-grabbing'); 49 testCursorRule('-webkit-zoom-in'); 50 testCursorRule('-webkit-zoom-out'); 47 51 testCursorRule('url(file:///foo.png)'); // IE compatibility 48 52 testCursorRule('url(file:///foo.png), crosshair'); -
trunk/Source/WebCore/ChangeLog
r173988 r173989 1 2014-09-25 Sungmann Cho <sungmann.cho@navercorp.com> 2 3 Unprefix CSS cursor values zoom-in and zoom-out. 4 https://bugs.webkit.org/show_bug.cgi?id=137061 5 6 Reviewed by Benjamin Poulain. 7 8 This patch unprefixes CSS cursor values zoom-in and zoom-out. 9 -webkit-zoom-in and -webkit-zoom-out are kept as aliases. 10 ECursor members use InterCaps with an initial capital letter for now. 11 12 * css/CSSParser.cpp: 13 (WebCore::CSSParser::parseValue): 14 * css/CSSPrimitiveValueMappings.h: 15 (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): 16 (WebCore::CSSPrimitiveValue::operator ECursor): 17 * css/CSSValueKeywords.in: 18 * css/DeprecatedStyleBuilder.cpp: 19 (WebCore::ApplyPropertyCursor::applyValue): 20 * html/ImageDocument.cpp: 21 (WebCore::ImageDocument::resizeImageToFit): 22 (WebCore::ImageDocument::restoreImageSize): 23 (WebCore::ImageDocument::windowSizeChanged): 24 * page/EventHandler.cpp: 25 (WebCore::EventHandler::selectCursor): 26 * rendering/style/RenderStyle.h: 27 * rendering/style/RenderStyleConstants.h: 28 1 29 2014-09-25 Brent Fulgham <bfulgham@apple.com> 2 30 -
trunk/Source/WebCore/css/CSSParser.cpp
r173965 r173989 1981 1981 // nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | ew-resize | 1982 1982 // ns-resize | nesw-resize | nwse-resize | col-resize | row-resize | text | wait | help | 1983 // vertical-text | cell | context-menu | alias | copy | no-drop | not-allowed | -webkit-zoom-in 1984 // -webkit-zoom-out | all-scroll | -webkit-grab | -webkit-grabbing ] ] | inherit 1983 // vertical-text | cell | context-menu | alias | copy | no-drop | not-allowed | 1984 // zoom-in | zoom-out | all-scroll | -webkit-grab | -webkit-grabbing | -webkit-zoom-in | 1985 // -webkit-zoom-out ] ] | inherit 1985 1986 RefPtr<CSSValueList> list; 1986 1987 while (value) { … … 2031 2032 } else if (inQuirksMode() && value->id == CSSValueHand) // MSIE 5 compatibility :/ 2032 2033 list->append(cssValuePool().createIdentifierValue(CSSValuePointer)); 2033 else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkit Grabbing) || value->id == CSSValueCopy || value->id == CSSValueNone)2034 else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone) 2034 2035 list->append(cssValuePool().createIdentifierValue(value->id)); 2035 2036 m_valueList->next(); … … 2041 2042 id = CSSValuePointer; 2042 2043 validPrimitive = true; 2043 } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkit Grabbing) || value->id == CSSValueCopy || value->id == CSSValueNone)2044 } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone) 2044 2045 validPrimitive = true; 2045 2046 } else { -
trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h
r173572 r173989 1147 1147 m_primitiveUnitType = CSS_VALUE_ID; 1148 1148 switch (e) { 1149 case C URSOR_AUTO:1149 case CursorAuto: 1150 1150 m_value.valueID = CSSValueAuto; 1151 1151 break; 1152 case C URSOR_CROSS:1152 case CursorCross: 1153 1153 m_value.valueID = CSSValueCrosshair; 1154 1154 break; 1155 case C URSOR_DEFAULT:1155 case CursorDefault: 1156 1156 m_value.valueID = CSSValueDefault; 1157 1157 break; 1158 case C URSOR_POINTER:1158 case CursorPointer: 1159 1159 m_value.valueID = CSSValuePointer; 1160 1160 break; 1161 case C URSOR_MOVE:1161 case CursorMove: 1162 1162 m_value.valueID = CSSValueMove; 1163 1163 break; 1164 case C URSOR_CELL:1164 case CursorCell: 1165 1165 m_value.valueID = CSSValueCell; 1166 1166 break; 1167 case C URSOR_VERTICAL_TEXT:1167 case CursorVerticalText: 1168 1168 m_value.valueID = CSSValueVerticalText; 1169 1169 break; 1170 case C URSOR_CONTEXT_MENU:1170 case CursorContextMenu: 1171 1171 m_value.valueID = CSSValueContextMenu; 1172 1172 break; 1173 case C URSOR_ALIAS:1173 case CursorAlias: 1174 1174 m_value.valueID = CSSValueAlias; 1175 1175 break; 1176 case C URSOR_COPY:1176 case CursorCopy: 1177 1177 m_value.valueID = CSSValueCopy; 1178 1178 break; 1179 case C URSOR_NONE:1179 case CursorNone: 1180 1180 m_value.valueID = CSSValueNone; 1181 1181 break; 1182 case C URSOR_PROGRESS:1182 case CursorProgress: 1183 1183 m_value.valueID = CSSValueProgress; 1184 1184 break; 1185 case C URSOR_NO_DROP:1185 case CursorNoDrop: 1186 1186 m_value.valueID = CSSValueNoDrop; 1187 1187 break; 1188 case C URSOR_NOT_ALLOWED:1188 case CursorNotAllowed: 1189 1189 m_value.valueID = CSSValueNotAllowed; 1190 1190 break; 1191 case C URSOR_WEBKIT_ZOOM_IN:1192 m_value.valueID = CSSValue WebkitZoomIn;1193 break; 1194 case C URSOR_WEBKIT_ZOOM_OUT:1195 m_value.valueID = CSSValue WebkitZoomOut;1196 break; 1197 case C URSOR_E_RESIZE:1191 case CursorZoomIn: 1192 m_value.valueID = CSSValueZoomIn; 1193 break; 1194 case CursorZoomOut: 1195 m_value.valueID = CSSValueZoomOut; 1196 break; 1197 case CursorEResize: 1198 1198 m_value.valueID = CSSValueEResize; 1199 1199 break; 1200 case C URSOR_NE_RESIZE:1200 case CursorNeResize: 1201 1201 m_value.valueID = CSSValueNeResize; 1202 1202 break; 1203 case C URSOR_NW_RESIZE:1203 case CursorNwResize: 1204 1204 m_value.valueID = CSSValueNwResize; 1205 1205 break; 1206 case C URSOR_N_RESIZE:1206 case CursorNResize: 1207 1207 m_value.valueID = CSSValueNResize; 1208 1208 break; 1209 case C URSOR_SE_RESIZE:1209 case CursorSeResize: 1210 1210 m_value.valueID = CSSValueSeResize; 1211 1211 break; 1212 case C URSOR_SW_RESIZE:1212 case CursorSwResize: 1213 1213 m_value.valueID = CSSValueSwResize; 1214 1214 break; 1215 case C URSOR_S_RESIZE:1215 case CursorSResize: 1216 1216 m_value.valueID = CSSValueSResize; 1217 1217 break; 1218 case C URSOR_W_RESIZE:1218 case CursorWResize: 1219 1219 m_value.valueID = CSSValueWResize; 1220 1220 break; 1221 case C URSOR_EW_RESIZE:1221 case CursorEwResize: 1222 1222 m_value.valueID = CSSValueEwResize; 1223 1223 break; 1224 case C URSOR_NS_RESIZE:1224 case CursorNsResize: 1225 1225 m_value.valueID = CSSValueNsResize; 1226 1226 break; 1227 case C URSOR_NESW_RESIZE:1227 case CursorNeswResize: 1228 1228 m_value.valueID = CSSValueNeswResize; 1229 1229 break; 1230 case C URSOR_NWSE_RESIZE:1230 case CursorNwseResize: 1231 1231 m_value.valueID = CSSValueNwseResize; 1232 1232 break; 1233 case C URSOR_COL_RESIZE:1233 case CursorColResize: 1234 1234 m_value.valueID = CSSValueColResize; 1235 1235 break; 1236 case C URSOR_ROW_RESIZE:1236 case CursorRowResize: 1237 1237 m_value.valueID = CSSValueRowResize; 1238 1238 break; 1239 case C URSOR_TEXT:1239 case CursorText: 1240 1240 m_value.valueID = CSSValueText; 1241 1241 break; 1242 case C URSOR_WAIT:1242 case CursorWait: 1243 1243 m_value.valueID = CSSValueWait; 1244 1244 break; 1245 case C URSOR_HELP:1245 case CursorHelp: 1246 1246 m_value.valueID = CSSValueHelp; 1247 1247 break; 1248 case C URSOR_ALL_SCROLL:1248 case CursorAllScroll: 1249 1249 m_value.valueID = CSSValueAllScroll; 1250 1250 break; 1251 case C URSOR_WEBKIT_GRAB:1251 case CursorWebkitGrab: 1252 1252 m_value.valueID = CSSValueWebkitGrab; 1253 1253 break; 1254 case C URSOR_WEBKIT_GRABBING:1254 case CursorWebkitGrabbing: 1255 1255 m_value.valueID = CSSValueWebkitGrabbing; 1256 1256 break; … … 1261 1261 { 1262 1262 ASSERT(isValueID()); 1263 1264 if (m_value.valueID == CSSValueCopy) 1265 return CURSOR_COPY; 1266 if (m_value.valueID == CSSValueNone) 1267 return CURSOR_NONE; 1268 return static_cast<ECursor>(m_value.valueID - CSSValueAuto); 1269 } 1270 1263 switch (m_value.valueID) { 1264 case CSSValueCopy: 1265 return CursorCopy; 1266 case CSSValueWebkitZoomIn: 1267 return CursorZoomIn; 1268 case CSSValueWebkitZoomOut: 1269 return CursorZoomOut; 1270 case CSSValueNone: 1271 return CursorNone; 1272 default: 1273 return static_cast<ECursor>(m_value.valueID - CSSValueAuto); 1274 } 1275 } 1271 1276 1272 1277 #if ENABLE(CURSOR_VISIBILITY) -
trunk/Source/WebCore/css/CSSValueKeywords.in
r173928 r173989 384 384 no-drop 385 385 not-allowed 386 -webkit-zoom-in387 -webkit-zoom-out386 zoom-in 387 zoom-out 388 388 e-resize 389 389 ne-resize … … 406 406 -webkit-grab 407 407 -webkit-grabbing 408 -webkit-zoom-in 409 -webkit-zoom-out 408 410 // none 409 411 // -
trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp
r173659 r173989 1223 1223 CSSValueList* list = toCSSValueList(value); 1224 1224 int len = list->length(); 1225 styleResolver->style()->setCursor(C URSOR_AUTO);1225 styleResolver->style()->setCursor(CursorAuto); 1226 1226 for (int i = 0; i < len; i++) { 1227 1227 CSSValue* item = list->itemWithoutBoundsCheck(i); -
trunk/Source/WebCore/html/ImageDocument.cpp
r173893 r173989 302 302 m_imageElement->setHeight(static_cast<int>(imageSize.height() * scale)); 303 303 304 m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValue WebkitZoomIn);304 m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomIn); 305 305 } 306 306 … … 317 317 m_imageElement->removeInlineStyleProperty(CSSPropertyCursor); 318 318 else 319 m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValue WebkitZoomOut);319 m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomOut); 320 320 321 321 m_didShrinkImage = false; … … 350 350 m_imageElement->removeInlineStyleProperty(CSSPropertyCursor); 351 351 else 352 m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValue WebkitZoomOut);352 m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomOut); 353 353 return; 354 354 } -
trunk/Source/WebCore/page/EventHandler.cpp
r173987 r173989 1436 1436 return iBeam; 1437 1437 1438 switch (style ? style->cursor() : C URSOR_AUTO) {1439 case C URSOR_AUTO: {1438 switch (style ? style->cursor() : CursorAuto) { 1439 case CursorAuto: { 1440 1440 bool editable = node->hasEditableStyle(); 1441 1441 … … 1455 1455 return pointerCursor(); 1456 1456 } 1457 case C URSOR_CROSS:1457 case CursorCross: 1458 1458 return crossCursor(); 1459 case C URSOR_POINTER:1459 case CursorPointer: 1460 1460 return handCursor(); 1461 case C URSOR_MOVE:1461 case CursorMove: 1462 1462 return moveCursor(); 1463 case C URSOR_ALL_SCROLL:1463 case CursorAllScroll: 1464 1464 return moveCursor(); 1465 case C URSOR_E_RESIZE:1465 case CursorEResize: 1466 1466 return eastResizeCursor(); 1467 case C URSOR_W_RESIZE:1467 case CursorWResize: 1468 1468 return westResizeCursor(); 1469 case C URSOR_N_RESIZE:1469 case CursorNResize: 1470 1470 return northResizeCursor(); 1471 case C URSOR_S_RESIZE:1471 case CursorSResize: 1472 1472 return southResizeCursor(); 1473 case C URSOR_NE_RESIZE:1473 case CursorNeResize: 1474 1474 return northEastResizeCursor(); 1475 case C URSOR_SW_RESIZE:1475 case CursorSwResize: 1476 1476 return southWestResizeCursor(); 1477 case C URSOR_NW_RESIZE:1477 case CursorNwResize: 1478 1478 return northWestResizeCursor(); 1479 case C URSOR_SE_RESIZE:1479 case CursorSeResize: 1480 1480 return southEastResizeCursor(); 1481 case C URSOR_NS_RESIZE:1481 case CursorNsResize: 1482 1482 return northSouthResizeCursor(); 1483 case C URSOR_EW_RESIZE:1483 case CursorEwResize: 1484 1484 return eastWestResizeCursor(); 1485 case C URSOR_NESW_RESIZE:1485 case CursorNeswResize: 1486 1486 return northEastSouthWestResizeCursor(); 1487 case C URSOR_NWSE_RESIZE:1487 case CursorNwseResize: 1488 1488 return northWestSouthEastResizeCursor(); 1489 case C URSOR_COL_RESIZE:1489 case CursorColResize: 1490 1490 return columnResizeCursor(); 1491 case C URSOR_ROW_RESIZE:1491 case CursorRowResize: 1492 1492 return rowResizeCursor(); 1493 case C URSOR_TEXT:1493 case CursorText: 1494 1494 return iBeamCursor(); 1495 case C URSOR_WAIT:1495 case CursorWait: 1496 1496 return waitCursor(); 1497 case C URSOR_HELP:1497 case CursorHelp: 1498 1498 return helpCursor(); 1499 case C URSOR_VERTICAL_TEXT:1499 case CursorVerticalText: 1500 1500 return verticalTextCursor(); 1501 case C URSOR_CELL:1501 case CursorCell: 1502 1502 return cellCursor(); 1503 case C URSOR_CONTEXT_MENU:1503 case CursorContextMenu: 1504 1504 return contextMenuCursor(); 1505 case C URSOR_PROGRESS:1505 case CursorProgress: 1506 1506 return progressCursor(); 1507 case C URSOR_NO_DROP:1507 case CursorNoDrop: 1508 1508 return noDropCursor(); 1509 case C URSOR_ALIAS:1509 case CursorAlias: 1510 1510 return aliasCursor(); 1511 case C URSOR_COPY:1511 case CursorCopy: 1512 1512 return copyCursor(); 1513 case C URSOR_NONE:1513 case CursorNone: 1514 1514 return noneCursor(); 1515 case C URSOR_NOT_ALLOWED:1515 case CursorNotAllowed: 1516 1516 return notAllowedCursor(); 1517 case C URSOR_DEFAULT:1517 case CursorDefault: 1518 1518 return pointerCursor(); 1519 case C URSOR_WEBKIT_ZOOM_IN:1519 case CursorZoomIn: 1520 1520 return zoomInCursor(); 1521 case C URSOR_WEBKIT_ZOOM_OUT:1521 case CursorZoomOut: 1522 1522 return zoomOutCursor(); 1523 case C URSOR_WEBKIT_GRAB:1523 case CursorWebkitGrab: 1524 1524 return grabCursor(); 1525 case C URSOR_WEBKIT_GRABBING:1525 case CursorWebkitGrabbing: 1526 1526 return grabbingCursor(); 1527 1527 } -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r173910 r173989 1801 1801 static short initialHorizontalBorderSpacing() { return 0; } 1802 1802 static short initialVerticalBorderSpacing() { return 0; } 1803 static ECursor initialCursor() { return C URSOR_AUTO; }1803 static ECursor initialCursor() { return CursorAuto; } 1804 1804 #if ENABLE(CURSOR_VISIBILITY) 1805 1805 static CursorVisibility initialCursorVisibility() { return CursorVisibilityAuto; } -
trunk/Source/WebCore/rendering/style/RenderStyleConstants.h
r173572 r173989 421 421 enum ECursor { 422 422 // The following must match the order in CSSValueKeywords.in. 423 C URSOR_AUTO,424 C URSOR_CROSS,425 C URSOR_DEFAULT,426 C URSOR_POINTER,427 C URSOR_MOVE,428 C URSOR_VERTICAL_TEXT,429 C URSOR_CELL,430 C URSOR_CONTEXT_MENU,431 C URSOR_ALIAS,432 C URSOR_PROGRESS,433 C URSOR_NO_DROP,434 C URSOR_NOT_ALLOWED,435 C URSOR_WEBKIT_ZOOM_IN,436 C URSOR_WEBKIT_ZOOM_OUT,437 C URSOR_E_RESIZE,438 C URSOR_NE_RESIZE,439 C URSOR_NW_RESIZE,440 C URSOR_N_RESIZE,441 C URSOR_SE_RESIZE,442 C URSOR_SW_RESIZE,443 C URSOR_S_RESIZE,444 C URSOR_W_RESIZE,445 C URSOR_EW_RESIZE,446 C URSOR_NS_RESIZE,447 C URSOR_NESW_RESIZE,448 C URSOR_NWSE_RESIZE,449 C URSOR_COL_RESIZE,450 C URSOR_ROW_RESIZE,451 C URSOR_TEXT,452 C URSOR_WAIT,453 C URSOR_HELP,454 C URSOR_ALL_SCROLL,455 C URSOR_WEBKIT_GRAB,456 C URSOR_WEBKIT_GRABBING,423 CursorAuto, 424 CursorCross, 425 CursorDefault, 426 CursorPointer, 427 CursorMove, 428 CursorVerticalText, 429 CursorCell, 430 CursorContextMenu, 431 CursorAlias, 432 CursorProgress, 433 CursorNoDrop, 434 CursorNotAllowed, 435 CursorZoomIn, 436 CursorZoomOut, 437 CursorEResize, 438 CursorNeResize, 439 CursorNwResize, 440 CursorNResize, 441 CursorSeResize, 442 CursorSwResize, 443 CursorSResize, 444 CursorWResize, 445 CursorEwResize, 446 CursorNsResize, 447 CursorNeswResize, 448 CursorNwseResize, 449 CursorColResize, 450 CursorRowResize, 451 CursorText, 452 CursorWait, 453 CursorHelp, 454 CursorAllScroll, 455 CursorWebkitGrab, 456 CursorWebkitGrabbing, 457 457 458 458 // The following are handled as exceptions so don't need to match. 459 C URSOR_COPY,460 C URSOR_NONE459 CursorCopy, 460 CursorNone 461 461 }; 462 462
Note: See TracChangeset
for help on using the changeset viewer.