<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173989] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173989">173989</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-25 18:00:56 -0700 (Thu, 25 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unprefix CSS cursor values zoom-in and zoom-out.
https://bugs.webkit.org/show_bug.cgi?id=137061
Patch by Sungmann Cho <sungmann.cho@navercorp.com> on 2014-09-25
Reviewed by Benjamin Poulain.
Source/WebCore:
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:
LayoutTests:
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcsscursorparsingexpectedtxt">trunk/LayoutTests/fast/css/cursor-parsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsscursorparsinghtml">trunk/LayoutTests/fast/css/cursor-parsing.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlImageDocumentcpp">trunk/Source/WebCore/html/ImageDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-26 00:39:20 UTC (rev 173988)
+++ trunk/LayoutTests/ChangeLog 2014-09-26 01:00:56 UTC (rev 173989)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-25 Sungmann Cho <sungmann.cho@navercorp.com>
+
+ 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:
+
</ins><span class="cx"> 2014-09-25 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Skip quicktime-plugin-snapshotted.html
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscursorparsingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/cursor-parsing-expected.txt (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -7,7 +7,11 @@
</span><span class="cx"> PASS roundtripCssRule("cursor: auto;") is "cursor: auto;"
</span><span class="cx"> PASS roundtripCssRule("cursor: none;") is "cursor: none;"
</span><span class="cx"> PASS roundtripCssRule("cursor: copy;") is "cursor: copy;"
</span><ins>+PASS roundtripCssRule("cursor: zoom-in;") is "cursor: zoom-in;"
+PASS roundtripCssRule("cursor: zoom-out;") is "cursor: zoom-out;"
</ins><span class="cx"> PASS roundtripCssRule("cursor: -webkit-grabbing;") is "cursor: -webkit-grabbing;"
</span><ins>+PASS roundtripCssRule("cursor: -webkit-zoom-in;") is "cursor: -webkit-zoom-in;"
+PASS roundtripCssRule("cursor: -webkit-zoom-out;") is "cursor: -webkit-zoom-out;"
</ins><span class="cx"> PASS roundtripCssRule("cursor: url(file:///foo.png);") is "cursor: url(file:///foo.png);"
</span><span class="cx"> PASS roundtripCssRule("cursor: url(file:///foo.png), crosshair;") is "cursor: url(file:///foo.png), crosshair;"
</span><span class="cx"> PASS roundtripCssRule("cursor: url(file:///foo.png), url(file:///foo2.png), pointer;") is "cursor: url(file:///foo.png), url(file:///foo2.png), pointer;"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscursorparsinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/cursor-parsing.html (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -43,7 +43,11 @@
</span><span class="cx"> testCursorRule('auto');
</span><span class="cx"> testCursorRule('none');
</span><span class="cx"> testCursorRule('copy');
</span><ins>+testCursorRule('zoom-in');
+testCursorRule('zoom-out');
</ins><span class="cx"> testCursorRule('-webkit-grabbing');
</span><ins>+testCursorRule('-webkit-zoom-in');
+testCursorRule('-webkit-zoom-out');
</ins><span class="cx"> testCursorRule('url(file:///foo.png)'); // IE compatibility
</span><span class="cx"> testCursorRule('url(file:///foo.png), crosshair');
</span><span class="cx"> testCursorRule('url(file:///foo.png), url(file:///foo2.png), pointer');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-09-25 Sungmann Cho <sungmann.cho@navercorp.com>
+
+ 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:
+
</ins><span class="cx"> 2014-09-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Debug builds of TestWebKitAPI are crashing.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1980,8 +1980,9 @@
</span><span class="cx"> // [ auto | crosshair | default | pointer | progress | move | e-resize | ne-resize |
</span><span class="cx"> // nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | ew-resize |
</span><span class="cx"> // ns-resize | nesw-resize | nwse-resize | col-resize | row-resize | text | wait | help |
</span><del>- // vertical-text | cell | context-menu | alias | copy | no-drop | not-allowed | -webkit-zoom-in
- // -webkit-zoom-out | all-scroll | -webkit-grab | -webkit-grabbing ] ] | inherit
</del><ins>+ // 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
</ins><span class="cx"> RefPtr<CSSValueList> list;
</span><span class="cx"> while (value) {
</span><span class="cx"> RefPtr<CSSValue> image = 0;
</span><span class="lines">@@ -2030,7 +2031,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> } else if (inQuirksMode() && value->id == CSSValueHand) // MSIE 5 compatibility :/
</span><span class="cx"> list->append(cssValuePool().createIdentifierValue(CSSValuePointer));
</span><del>- else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitGrabbing) || value->id == CSSValueCopy || value->id == CSSValueNone)
</del><ins>+ else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone)
</ins><span class="cx"> list->append(cssValuePool().createIdentifierValue(value->id));
</span><span class="cx"> m_valueList->next();
</span><span class="cx"> parsedValue = list.release();
</span><span class="lines">@@ -2040,7 +2041,7 @@
</span><span class="cx"> if (inQuirksMode() && value->id == CSSValueHand) { // MSIE 5 compatibility :/
</span><span class="cx"> id = CSSValuePointer;
</span><span class="cx"> validPrimitive = true;
</span><del>- } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitGrabbing) || value->id == CSSValueCopy || value->id == CSSValueNone)
</del><ins>+ } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone)
</ins><span class="cx"> validPrimitive = true;
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1146,112 +1146,112 @@
</span><span class="cx"> {
</span><span class="cx"> m_primitiveUnitType = CSS_VALUE_ID;
</span><span class="cx"> switch (e) {
</span><del>- case CURSOR_AUTO:
</del><ins>+ case CursorAuto:
</ins><span class="cx"> m_value.valueID = CSSValueAuto;
</span><span class="cx"> break;
</span><del>- case CURSOR_CROSS:
</del><ins>+ case CursorCross:
</ins><span class="cx"> m_value.valueID = CSSValueCrosshair;
</span><span class="cx"> break;
</span><del>- case CURSOR_DEFAULT:
</del><ins>+ case CursorDefault:
</ins><span class="cx"> m_value.valueID = CSSValueDefault;
</span><span class="cx"> break;
</span><del>- case CURSOR_POINTER:
</del><ins>+ case CursorPointer:
</ins><span class="cx"> m_value.valueID = CSSValuePointer;
</span><span class="cx"> break;
</span><del>- case CURSOR_MOVE:
</del><ins>+ case CursorMove:
</ins><span class="cx"> m_value.valueID = CSSValueMove;
</span><span class="cx"> break;
</span><del>- case CURSOR_CELL:
</del><ins>+ case CursorCell:
</ins><span class="cx"> m_value.valueID = CSSValueCell;
</span><span class="cx"> break;
</span><del>- case CURSOR_VERTICAL_TEXT:
</del><ins>+ case CursorVerticalText:
</ins><span class="cx"> m_value.valueID = CSSValueVerticalText;
</span><span class="cx"> break;
</span><del>- case CURSOR_CONTEXT_MENU:
</del><ins>+ case CursorContextMenu:
</ins><span class="cx"> m_value.valueID = CSSValueContextMenu;
</span><span class="cx"> break;
</span><del>- case CURSOR_ALIAS:
</del><ins>+ case CursorAlias:
</ins><span class="cx"> m_value.valueID = CSSValueAlias;
</span><span class="cx"> break;
</span><del>- case CURSOR_COPY:
</del><ins>+ case CursorCopy:
</ins><span class="cx"> m_value.valueID = CSSValueCopy;
</span><span class="cx"> break;
</span><del>- case CURSOR_NONE:
</del><ins>+ case CursorNone:
</ins><span class="cx"> m_value.valueID = CSSValueNone;
</span><span class="cx"> break;
</span><del>- case CURSOR_PROGRESS:
</del><ins>+ case CursorProgress:
</ins><span class="cx"> m_value.valueID = CSSValueProgress;
</span><span class="cx"> break;
</span><del>- case CURSOR_NO_DROP:
</del><ins>+ case CursorNoDrop:
</ins><span class="cx"> m_value.valueID = CSSValueNoDrop;
</span><span class="cx"> break;
</span><del>- case CURSOR_NOT_ALLOWED:
</del><ins>+ case CursorNotAllowed:
</ins><span class="cx"> m_value.valueID = CSSValueNotAllowed;
</span><span class="cx"> break;
</span><del>- case CURSOR_WEBKIT_ZOOM_IN:
- m_value.valueID = CSSValueWebkitZoomIn;
</del><ins>+ case CursorZoomIn:
+ m_value.valueID = CSSValueZoomIn;
</ins><span class="cx"> break;
</span><del>- case CURSOR_WEBKIT_ZOOM_OUT:
- m_value.valueID = CSSValueWebkitZoomOut;
</del><ins>+ case CursorZoomOut:
+ m_value.valueID = CSSValueZoomOut;
</ins><span class="cx"> break;
</span><del>- case CURSOR_E_RESIZE:
</del><ins>+ case CursorEResize:
</ins><span class="cx"> m_value.valueID = CSSValueEResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_NE_RESIZE:
</del><ins>+ case CursorNeResize:
</ins><span class="cx"> m_value.valueID = CSSValueNeResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_NW_RESIZE:
</del><ins>+ case CursorNwResize:
</ins><span class="cx"> m_value.valueID = CSSValueNwResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_N_RESIZE:
</del><ins>+ case CursorNResize:
</ins><span class="cx"> m_value.valueID = CSSValueNResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_SE_RESIZE:
</del><ins>+ case CursorSeResize:
</ins><span class="cx"> m_value.valueID = CSSValueSeResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_SW_RESIZE:
</del><ins>+ case CursorSwResize:
</ins><span class="cx"> m_value.valueID = CSSValueSwResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_S_RESIZE:
</del><ins>+ case CursorSResize:
</ins><span class="cx"> m_value.valueID = CSSValueSResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_W_RESIZE:
</del><ins>+ case CursorWResize:
</ins><span class="cx"> m_value.valueID = CSSValueWResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_EW_RESIZE:
</del><ins>+ case CursorEwResize:
</ins><span class="cx"> m_value.valueID = CSSValueEwResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_NS_RESIZE:
</del><ins>+ case CursorNsResize:
</ins><span class="cx"> m_value.valueID = CSSValueNsResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_NESW_RESIZE:
</del><ins>+ case CursorNeswResize:
</ins><span class="cx"> m_value.valueID = CSSValueNeswResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_NWSE_RESIZE:
</del><ins>+ case CursorNwseResize:
</ins><span class="cx"> m_value.valueID = CSSValueNwseResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_COL_RESIZE:
</del><ins>+ case CursorColResize:
</ins><span class="cx"> m_value.valueID = CSSValueColResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_ROW_RESIZE:
</del><ins>+ case CursorRowResize:
</ins><span class="cx"> m_value.valueID = CSSValueRowResize;
</span><span class="cx"> break;
</span><del>- case CURSOR_TEXT:
</del><ins>+ case CursorText:
</ins><span class="cx"> m_value.valueID = CSSValueText;
</span><span class="cx"> break;
</span><del>- case CURSOR_WAIT:
</del><ins>+ case CursorWait:
</ins><span class="cx"> m_value.valueID = CSSValueWait;
</span><span class="cx"> break;
</span><del>- case CURSOR_HELP:
</del><ins>+ case CursorHelp:
</ins><span class="cx"> m_value.valueID = CSSValueHelp;
</span><span class="cx"> break;
</span><del>- case CURSOR_ALL_SCROLL:
</del><ins>+ case CursorAllScroll:
</ins><span class="cx"> m_value.valueID = CSSValueAllScroll;
</span><span class="cx"> break;
</span><del>- case CURSOR_WEBKIT_GRAB:
</del><ins>+ case CursorWebkitGrab:
</ins><span class="cx"> m_value.valueID = CSSValueWebkitGrab;
</span><span class="cx"> break;
</span><del>- case CURSOR_WEBKIT_GRABBING:
</del><ins>+ case CursorWebkitGrabbing:
</ins><span class="cx"> m_value.valueID = CSSValueWebkitGrabbing;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1260,15 +1260,20 @@
</span><span class="cx"> template<> inline CSSPrimitiveValue::operator ECursor() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isValueID());
</span><del>-
- if (m_value.valueID == CSSValueCopy)
- return CURSOR_COPY;
- if (m_value.valueID == CSSValueNone)
- return CURSOR_NONE;
- return static_cast<ECursor>(m_value.valueID - CSSValueAuto);
</del><ins>+ 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);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CursorVisibility e)
</span><span class="cx"> : CSSValue(PrimitiveClass)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -383,8 +383,8 @@
</span><span class="cx"> progress
</span><span class="cx"> no-drop
</span><span class="cx"> not-allowed
</span><del>--webkit-zoom-in
--webkit-zoom-out
</del><ins>+zoom-in
+zoom-out
</ins><span class="cx"> e-resize
</span><span class="cx"> ne-resize
</span><span class="cx"> nw-resize
</span><span class="lines">@@ -405,6 +405,8 @@
</span><span class="cx"> all-scroll
</span><span class="cx"> -webkit-grab
</span><span class="cx"> -webkit-grabbing
</span><ins>+-webkit-zoom-in
+-webkit-zoom-out
</ins><span class="cx"> // none
</span><span class="cx"> //
</span><span class="cx"> // CSS_PROP_CURSOR_VISIBILITY:
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1222,7 +1222,7 @@
</span><span class="cx"> if (value->isValueList()) {
</span><span class="cx"> CSSValueList* list = toCSSValueList(value);
</span><span class="cx"> int len = list->length();
</span><del>- styleResolver->style()->setCursor(CURSOR_AUTO);
</del><ins>+ styleResolver->style()->setCursor(CursorAuto);
</ins><span class="cx"> for (int i = 0; i < len; i++) {
</span><span class="cx"> CSSValue* item = list->itemWithoutBoundsCheck(i);
</span><span class="cx"> if (item->isCursorImageValue()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageDocument.cpp (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> m_imageElement->setWidth(static_cast<int>(imageSize.width() * scale));
</span><span class="cx"> m_imageElement->setHeight(static_cast<int>(imageSize.height() * scale));
</span><span class="cx">
</span><del>- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomIn);
</del><ins>+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomIn);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageDocument::restoreImageSize()
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> if (imageFitsInWindow())
</span><span class="cx"> m_imageElement->removeInlineStyleProperty(CSSPropertyCursor);
</span><span class="cx"> else
</span><del>- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomOut);
</del><ins>+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomOut);
</ins><span class="cx">
</span><span class="cx"> m_didShrinkImage = false;
</span><span class="cx"> }
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> if (fitsInWindow)
</span><span class="cx"> m_imageElement->removeInlineStyleProperty(CSSPropertyCursor);
</span><span class="cx"> else
</span><del>- m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomOut);
</del><ins>+ m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueZoomOut);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1435,8 +1435,8 @@
</span><span class="cx"> && !m_capturingMouseEventsElement)
</span><span class="cx"> return iBeam;
</span><span class="cx">
</span><del>- switch (style ? style->cursor() : CURSOR_AUTO) {
- case CURSOR_AUTO: {
</del><ins>+ switch (style ? style->cursor() : CursorAuto) {
+ case CursorAuto: {
</ins><span class="cx"> bool editable = node->hasEditableStyle();
</span><span class="cx">
</span><span class="cx"> if (useHandCursor(node, result.isOverLink(), shiftKey))
</span><span class="lines">@@ -1454,75 +1454,75 @@
</span><span class="cx"> return iBeam;
</span><span class="cx"> return pointerCursor();
</span><span class="cx"> }
</span><del>- case CURSOR_CROSS:
</del><ins>+ case CursorCross:
</ins><span class="cx"> return crossCursor();
</span><del>- case CURSOR_POINTER:
</del><ins>+ case CursorPointer:
</ins><span class="cx"> return handCursor();
</span><del>- case CURSOR_MOVE:
</del><ins>+ case CursorMove:
</ins><span class="cx"> return moveCursor();
</span><del>- case CURSOR_ALL_SCROLL:
</del><ins>+ case CursorAllScroll:
</ins><span class="cx"> return moveCursor();
</span><del>- case CURSOR_E_RESIZE:
</del><ins>+ case CursorEResize:
</ins><span class="cx"> return eastResizeCursor();
</span><del>- case CURSOR_W_RESIZE:
</del><ins>+ case CursorWResize:
</ins><span class="cx"> return westResizeCursor();
</span><del>- case CURSOR_N_RESIZE:
</del><ins>+ case CursorNResize:
</ins><span class="cx"> return northResizeCursor();
</span><del>- case CURSOR_S_RESIZE:
</del><ins>+ case CursorSResize:
</ins><span class="cx"> return southResizeCursor();
</span><del>- case CURSOR_NE_RESIZE:
</del><ins>+ case CursorNeResize:
</ins><span class="cx"> return northEastResizeCursor();
</span><del>- case CURSOR_SW_RESIZE:
</del><ins>+ case CursorSwResize:
</ins><span class="cx"> return southWestResizeCursor();
</span><del>- case CURSOR_NW_RESIZE:
</del><ins>+ case CursorNwResize:
</ins><span class="cx"> return northWestResizeCursor();
</span><del>- case CURSOR_SE_RESIZE:
</del><ins>+ case CursorSeResize:
</ins><span class="cx"> return southEastResizeCursor();
</span><del>- case CURSOR_NS_RESIZE:
</del><ins>+ case CursorNsResize:
</ins><span class="cx"> return northSouthResizeCursor();
</span><del>- case CURSOR_EW_RESIZE:
</del><ins>+ case CursorEwResize:
</ins><span class="cx"> return eastWestResizeCursor();
</span><del>- case CURSOR_NESW_RESIZE:
</del><ins>+ case CursorNeswResize:
</ins><span class="cx"> return northEastSouthWestResizeCursor();
</span><del>- case CURSOR_NWSE_RESIZE:
</del><ins>+ case CursorNwseResize:
</ins><span class="cx"> return northWestSouthEastResizeCursor();
</span><del>- case CURSOR_COL_RESIZE:
</del><ins>+ case CursorColResize:
</ins><span class="cx"> return columnResizeCursor();
</span><del>- case CURSOR_ROW_RESIZE:
</del><ins>+ case CursorRowResize:
</ins><span class="cx"> return rowResizeCursor();
</span><del>- case CURSOR_TEXT:
</del><ins>+ case CursorText:
</ins><span class="cx"> return iBeamCursor();
</span><del>- case CURSOR_WAIT:
</del><ins>+ case CursorWait:
</ins><span class="cx"> return waitCursor();
</span><del>- case CURSOR_HELP:
</del><ins>+ case CursorHelp:
</ins><span class="cx"> return helpCursor();
</span><del>- case CURSOR_VERTICAL_TEXT:
</del><ins>+ case CursorVerticalText:
</ins><span class="cx"> return verticalTextCursor();
</span><del>- case CURSOR_CELL:
</del><ins>+ case CursorCell:
</ins><span class="cx"> return cellCursor();
</span><del>- case CURSOR_CONTEXT_MENU:
</del><ins>+ case CursorContextMenu:
</ins><span class="cx"> return contextMenuCursor();
</span><del>- case CURSOR_PROGRESS:
</del><ins>+ case CursorProgress:
</ins><span class="cx"> return progressCursor();
</span><del>- case CURSOR_NO_DROP:
</del><ins>+ case CursorNoDrop:
</ins><span class="cx"> return noDropCursor();
</span><del>- case CURSOR_ALIAS:
</del><ins>+ case CursorAlias:
</ins><span class="cx"> return aliasCursor();
</span><del>- case CURSOR_COPY:
</del><ins>+ case CursorCopy:
</ins><span class="cx"> return copyCursor();
</span><del>- case CURSOR_NONE:
</del><ins>+ case CursorNone:
</ins><span class="cx"> return noneCursor();
</span><del>- case CURSOR_NOT_ALLOWED:
</del><ins>+ case CursorNotAllowed:
</ins><span class="cx"> return notAllowedCursor();
</span><del>- case CURSOR_DEFAULT:
</del><ins>+ case CursorDefault:
</ins><span class="cx"> return pointerCursor();
</span><del>- case CURSOR_WEBKIT_ZOOM_IN:
</del><ins>+ case CursorZoomIn:
</ins><span class="cx"> return zoomInCursor();
</span><del>- case CURSOR_WEBKIT_ZOOM_OUT:
</del><ins>+ case CursorZoomOut:
</ins><span class="cx"> return zoomOutCursor();
</span><del>- case CURSOR_WEBKIT_GRAB:
</del><ins>+ case CursorWebkitGrab:
</ins><span class="cx"> return grabCursor();
</span><del>- case CURSOR_WEBKIT_GRABBING:
</del><ins>+ case CursorWebkitGrabbing:
</ins><span class="cx"> return grabbingCursor();
</span><span class="cx"> }
</span><span class="cx"> return pointerCursor();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1800,7 +1800,7 @@
</span><span class="cx"> static EWhiteSpace initialWhiteSpace() { return NORMAL; }
</span><span class="cx"> static short initialHorizontalBorderSpacing() { return 0; }
</span><span class="cx"> static short initialVerticalBorderSpacing() { return 0; }
</span><del>- static ECursor initialCursor() { return CURSOR_AUTO; }
</del><ins>+ static ECursor initialCursor() { return CursorAuto; }
</ins><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> static CursorVisibility initialCursorVisibility() { return CursorVisibilityAuto; }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (173988 => 173989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -420,44 +420,44 @@
</span><span class="cx">
</span><span class="cx"> enum ECursor {
</span><span class="cx"> // The following must match the order in CSSValueKeywords.in.
</span><del>- 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,
</del><ins>+ 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,
</ins><span class="cx">
</span><span class="cx"> // The following are handled as exceptions so don't need to match.
</span><del>- CURSOR_COPY,
- CURSOR_NONE
</del><ins>+ CursorCopy,
+ CursorNone
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span></span></pre>
</div>
</div>
</body>
</html>