<!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>[198255] 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/198255">198255</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-03-15 18:51:12 -0700 (Tue, 15 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove overflow: -webkit-marquee
https://bugs.webkit.org/show_bug.cgi?id=155517
&lt;rdar://problem/25028481&gt;

Reviewed by Simon Fraser.

This patch is based on Blink patch from jchaffraix@chromium.org (https://src.chromium.org/viewvc/blink?revision=151756&amp;view=revision)

Source/WebCore:

* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted.
(WebCore::CSSPrimitiveValue::operator EOverflow): Deleted.
* css/CSSValueKeywords.in:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::adjustRenderStyle):
* css/html.css:
(marquee): Deleted.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::sizesLogicalWidthToFitContent):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollTo):
(WebCore::RenderLayer::updateScrollInfoAfterLayout):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:
* rendering/RenderMarquee.h:
* rendering/style/RenderStyleConstants.h:

LayoutTests:

* fast/css/getPropertyValue-webkit-marquee.html:
* fast/css/webkit-marquee-anonymous-node-crash-expected.txt: Removed.
* fast/css/webkit-marquee-anonymous-node-crash.html: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgetPropertyValuewebkitmarqueehtml">trunk/LayoutTests/fast/css/getPropertyValue-webkit-marquee.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="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMarqueeh">trunk/Source/WebCore/rendering/RenderMarquee.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsswebkitmarqueeanonymousnodecrashexpectedtxt">trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsswebkitmarqueeanonymousnodecrashhtml">trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/LayoutTests/ChangeLog        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-03-15  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Remove overflow: -webkit-marquee
+        https://bugs.webkit.org/show_bug.cgi?id=155517
+        &lt;rdar://problem/25028481&gt;
+
+        Reviewed by Simon Fraser.
+
+        This patch is based on Blink patch from jchaffraix@chromium.org (https://src.chromium.org/viewvc/blink?revision=151756&amp;view=revision)
+
+        * fast/css/getPropertyValue-webkit-marquee.html:
+        * fast/css/webkit-marquee-anonymous-node-crash-expected.txt: Removed.
+        * fast/css/webkit-marquee-anonymous-node-crash.html: Removed.
+
</ins><span class="cx"> 2016-03-15  Joanmarie Diggs  &lt;jdiggs@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: Expose pointers to SVG elements referenced by aria-labelledby
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetPropertyValuewebkitmarqueehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx">         display: inline-block;
</span><span class="cx">         height: 5em;
</span><span class="cx">         width: 10em;
</span><del>-        overflow-x: -webkit-marquee;
</del><span class="cx">       }
</span><span class="cx">     &lt;/style&gt;
</span><span class="cx">     &lt;script src=&quot;../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
</span><span class="lines">@@ -17,20 +16,20 @@
</span><span class="cx">     &lt;/script&gt;
</span><span class="cx">   &lt;/head&gt;
</span><span class="cx">   &lt;body&gt;
</span><del>-    &lt;div id=&quot;marquee1&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards medium 10 slide normal;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee2&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: auto large 10 slide;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee3&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards infinite slide normal;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee4&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards medium slide normal;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee5&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: medium 10 slide normal;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee6&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards small normal;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee7&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards medium infinite;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee8&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: slide fast;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee9&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee10&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: alternate;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee11&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: infinite;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee12&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: foo;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee13&quot; class=&quot;test&quot; style=&quot;-webkit-marquee-direction: forwards; -webkit-marquee-speed: fast;&quot;&gt;&lt;/div&gt;
-    &lt;div id=&quot;marquee14&quot; class=&quot;test&quot; style=&quot;-webkit-marquee-repetition: infinite; -webkit-marquee-style: none;&quot;&gt;&lt;/div&gt;
</del><ins>+    &lt;marquee id=&quot;marquee1&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards medium 10 slide normal;&quot;&gt;&lt;/&lt;marquee&gt;
+    &lt;marquee id=&quot;marquee2&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: auto large 10 slide;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee3&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards infinite slide normal;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee4&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards medium slide normal;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee5&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: medium 10 slide normal;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee6&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards small normal;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee7&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards medium infinite;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee8&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: slide fast;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee9&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: forwards;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee10&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: alternate;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee11&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: infinite;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee12&quot; class=&quot;test&quot; style=&quot;-webkit-marquee: foo;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee13&quot; class=&quot;test&quot; style=&quot;-webkit-marquee-direction: forwards; -webkit-marquee-speed: fast;&quot;&gt;&lt;/marquee&gt;
+    &lt;marquee id=&quot;marquee14&quot; class=&quot;test&quot; style=&quot;-webkit-marquee-repetition: infinite; -webkit-marquee-style: none;&quot;&gt;&lt;/marquee&gt;
</ins><span class="cx"> 
</span><span class="cx">     &lt;script&gt;
</span><span class="cx">       description(&quot;&lt;a href=\&quot;https://bugs.webkit.org/show_bug.cgi?id=110816\&quot;&gt;Bug 110816: getPropertyValue for -webkit-marquee returns null, should compute the shorthand value&lt;/a&gt;&quot;);
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsswebkitmarqueeanonymousnodecrashexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash-expected.txt (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash-expected.txt        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash-expected.txt        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-Should not crash
</del></span></pre></div>
<a id="trunkLayoutTestsfastcsswebkitmarqueeanonymousnodecrashhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash.html (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash.html        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/LayoutTests/fast/css/webkit-marquee-anonymous-node-crash.html        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;style&gt;p:first-letter { overflow: -webkit-marquee; float: left; }&lt;/style&gt;
-&lt;script&gt;
-if (window.testRunner)
-    testRunner.dumpAsText();
-&lt;/script&gt;
-&lt;body&gt;
-    &lt;p&gt;Should not crash&lt;/p&gt;
-&lt;/body&gt;
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/ChangeLog        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-03-15  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Remove overflow: -webkit-marquee
+        https://bugs.webkit.org/show_bug.cgi?id=155517
+        &lt;rdar://problem/25028481&gt;
+
+        Reviewed by Simon Fraser.
+
+        This patch is based on Blink patch from jchaffraix@chromium.org (https://src.chromium.org/viewvc/blink?revision=151756&amp;view=revision)
+
+        * css/CSSParser.cpp:
+        (WebCore::isValidKeywordPropertyAndValue):
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted.
+        (WebCore::CSSPrimitiveValue::operator EOverflow): Deleted.
+        * css/CSSValueKeywords.in:
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::adjustRenderStyle):
+        * css/html.css:
+        (marquee): Deleted.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::sizesLogicalWidthToFitContent):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollTo):
+        (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+        (WebCore::RenderLayer::calculateClipRects):
+        * rendering/RenderLayer.h:
+        * rendering/RenderMarquee.h:
+        * rendering/style/RenderStyleConstants.h:
+
</ins><span class="cx"> 2016-03-15  Joanmarie Diggs  &lt;jdiggs@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: Expose pointers to SVG elements referenced by aria-labelledby
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/CSSParser.cpp        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -731,12 +731,12 @@
</span><span class="cx">             return true;
</span><span class="cx">         break;
</span><span class="cx"> #endif
</span><del>-    case CSSPropertyOverflowX: // visible | hidden | scroll | auto | marquee | overlay | inherit
-        if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitMarquee)
</del><ins>+    case CSSPropertyOverflowX: // visible | hidden | scroll | auto  | overlay | inherit
+        if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay)
</ins><span class="cx">             return true;
</span><span class="cx">         break;
</span><del>-    case CSSPropertyOverflowY: // visible | hidden | scroll | auto | marquee | overlay | inherit | -webkit-paged-x | -webkit-paged-y
-        if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitMarquee || valueID == CSSValueWebkitPagedX || valueID == CSSValueWebkitPagedY)
</del><ins>+    case CSSPropertyOverflowY: // visible | hidden | scroll | auto | overlay | inherit | -webkit-paged-x | -webkit-paged-y
+        if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitPagedX || valueID == CSSValueWebkitPagedY)
</ins><span class="cx">             return true;
</span><span class="cx">         break;
</span><span class="cx">     case CSSPropertyPageBreakAfter: // auto | always | avoid | left | right | inherit
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -2180,9 +2180,6 @@
</span><span class="cx">     case OAUTO:
</span><span class="cx">         m_value.valueID = CSSValueAuto;
</span><span class="cx">         break;
</span><del>-    case OMARQUEE:
-        m_value.valueID = CSSValueWebkitMarquee;
-        break;
</del><span class="cx">     case OOVERLAY:
</span><span class="cx">         m_value.valueID = CSSValueOverlay;
</span><span class="cx">         break;
</span><span class="lines">@@ -2208,8 +2205,6 @@
</span><span class="cx">         return OSCROLL;
</span><span class="cx">     case CSSValueAuto:
</span><span class="cx">         return OAUTO;
</span><del>-    case CSSValueWebkitMarquee:
-        return OMARQUEE;
</del><span class="cx">     case CSSValueOverlay:
</span><span class="cx">         return OOVERLAY;
</span><span class="cx">     case CSSValueWebkitPagedX:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -522,7 +522,6 @@
</span><span class="cx"> local
</span><span class="cx"> loud
</span><span class="cx"> lower
</span><del>--webkit-marquee
</del><span class="cx"> mix
</span><span class="cx"> no-close-quote
</span><span class="cx"> no-open-quote
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -888,12 +888,14 @@
</span><span class="cx">     else
</span><span class="cx">         style.addToTextDecorationsInEffect(style.textDecoration());
</span><span class="cx"> 
</span><ins>+    // For now, &lt;marquee&gt; requires an overflow clip to work properly.
+    if (is&lt;HTMLMarqueeElement&gt;(e)) {
+        style.setOverflowX(OHIDDEN);
+        style.setOverflowY(OHIDDEN);
+    }
+
</ins><span class="cx">     // If either overflow value is not visible, change to auto.
</span><del>-    if (style.overflowX() == OMARQUEE &amp;&amp; style.overflowY() != OMARQUEE)
-        style.setOverflowY(OMARQUEE);
-    else if (style.overflowY() == OMARQUEE &amp;&amp; style.overflowX() != OMARQUEE)
-        style.setOverflowX(OMARQUEE);
-    else if (style.overflowX() == OVISIBLE &amp;&amp; style.overflowY() != OVISIBLE) {
</del><ins>+    if (style.overflowX() == OVISIBLE &amp;&amp; style.overflowY() != OVISIBLE) {
</ins><span class="cx">         // FIXME: Once we implement pagination controls, overflow-x should default to hidden
</span><span class="cx">         // if overflow-y is set to -webkit-paged-x or -webkit-page-y. For now, we'll let it
</span><span class="cx">         // default to auto so we can at least scroll through the pages.
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/css/html.css        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> 
</span><span class="cx"> marquee {
</span><span class="cx">     display: inline-block;
</span><del>-    overflow: -webkit-marquee;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> blockquote {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -2572,7 +2572,7 @@
</span><span class="cx">     // FIXME: Think about block-flow here.  Need to find out how marquee direction relates to
</span><span class="cx">     // block-flow (as well as how marquee overflow should relate to block flow).
</span><span class="cx">     // https://bugs.webkit.org/show_bug.cgi?id=46472
</span><del>-    if (parent()-&gt;style().overflowX() == OMARQUEE) {
</del><ins>+    if (parent()-&gt;isHTMLMarquee()) {
</ins><span class="cx">         EMarqueeDirection dir = parent()-&gt;style().marqueeDirection();
</span><span class="cx">         if (dir == MAUTO || dir == MFORWARD || dir == MBACKWARD || dir == MLEFT || dir == MRIGHT)
</span><span class="cx">             return true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -2347,7 +2347,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     ScrollPosition newPosition = position;
</span><del>-    if (box-&gt;style().overflowX() != OMARQUEE) {
</del><ins>+    if (!box-&gt;isHTMLMarquee()) {
</ins><span class="cx">         // Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
</span><span class="cx">         if (m_scrollDimensionsDirty)
</span><span class="cx">             computeScrollDimensions();
</span><span class="lines">@@ -3495,7 +3495,7 @@
</span><span class="cx">     updateSnapOffsets();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    if (box-&gt;style().overflowX() != OMARQUEE &amp;&amp; !isRubberBandInProgress()) {
</del><ins>+    if (!box-&gt;isHTMLMarquee() &amp;&amp; !isRubberBandInProgress()) {
</ins><span class="cx">         // Layout may cause us to be at an invalid scroll position. In this case we need
</span><span class="cx">         // to pull our scroll offsets back to the max (or push them up to the min).
</span><span class="cx">         ScrollOffset clampedScrollOffset = clampScrollOffset(scrollOffset());
</span><span class="lines">@@ -6675,7 +6675,7 @@
</span><span class="cx">         dirtyStackingContainerZOrderLists();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (renderer().style().overflowX() == OMARQUEE &amp;&amp; renderer().style().marqueeBehavior() != MNONE &amp;&amp; renderer().isBox()) {
</del><ins>+    if (renderer().isHTMLMarquee() &amp;&amp; renderer().style().marqueeBehavior() != MNONE &amp;&amp; renderer().isBox()) {
</ins><span class="cx">         if (!m_marquee)
</span><span class="cx">             m_marquee = std::make_unique&lt;RenderMarquee&gt;(this);
</span><span class="cx">         m_marquee-&gt;updateMarqueeStyle();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/RenderLayer.h        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -1122,7 +1122,7 @@
</span><span class="cx">     
</span><span class="cx">     IntPoint m_cachedOverlayScrollbarOffset;
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;RenderMarquee&gt; m_marquee; // Used by layers with overflow:marquee
</del><ins>+    std::unique_ptr&lt;RenderMarquee&gt; m_marquee; // Used for &lt;marquee&gt;.
</ins><span class="cx">     
</span><span class="cx">     // Cached normal flow values for absolute positioned elements with static left/top values.
</span><span class="cx">     LayoutUnit m_staticInlinePosition;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMarqueeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMarquee.h (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMarquee.h        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/RenderMarquee.h        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> 
</span><span class="cx"> class RenderLayer;
</span><span class="cx"> 
</span><del>-// This class handles the auto-scrolling of layers with overflow: marquee.
</del><ins>+// This class handles the auto-scrolling for &lt;marquee&gt;
</ins><span class="cx"> class RenderMarquee final {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(RenderMarquee); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (198254 => 198255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h        2016-03-16 01:45:57 UTC (rev 198254)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h        2016-03-16 01:51:12 UTC (rev 198255)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> // Random visual rendering model attributes. Not inherited.
</span><span class="cx"> 
</span><span class="cx"> enum EOverflow {
</span><del>-    OVISIBLE, OHIDDEN, OSCROLL, OAUTO, OOVERLAY, OMARQUEE, OPAGEDX, OPAGEDY
</del><ins>+    OVISIBLE, OHIDDEN, OSCROLL, OAUTO, OOVERLAY, OPAGEDX, OPAGEDY
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> enum EVerticalAlign {
</span></span></pre>
</div>
</div>

</body>
</html>