<!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>[205562] 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/205562">205562</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-07 12:47:14 -0700 (Wed, 07 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Align HTMLAreaElement shape parsing with the specification
https://bugs.webkit.org/show_bug.cgi?id=161698
Reviewed by Daniel Bates.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing. Chrome is also
passing all the checks in this test.
* web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape-expected.txt:
* web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape.html:
Incorporate https://github.com/w3c/web-platform-tests/pull/3659
Source/WebCore:
Align HTMLAreaElement shape parsing with the specification:
- https://html.spec.whatwg.org/#attr-area-shape
In particular, add support for circ / polygon non conforming shapes
and use rectangle as default state.
This also aligns our behavior with Chrome.
No new tests, rebaselined existing test.
* html/HTMLAreaElement.cpp:
(WebCore::HTMLAreaElement::parseAttribute):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontenttheareaelementareashapeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontenttheareaelementareashapehtml">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAreaElementcpp">trunk/Source/WebCore/html/HTMLAreaElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (205561 => 205562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-07 19:45:52 UTC (rev 205561)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-07 19:47:14 UTC (rev 205562)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-09-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Align HTMLAreaElement shape parsing with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=161698
+
+ Reviewed by Daniel Bates.
+
+ Rebaseline W3C test now that more checks are passing. Chrome is also
+ passing all the checks in this test.
+
+ * web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape-expected.txt:
+ * web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape.html:
+ Incorporate https://github.com/w3c/web-platform-tests/pull/3659
+
+2016-09-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Drop legacy canvas.probablySupportsContext()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161692
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontenttheareaelementareashapeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape-expected.txt (205561 => 205562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape-expected.txt 2016-09-07 19:45:52 UTC (rev 205561)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape-expected.txt 2016-09-07 19:47:14 UTC (rev 205562)
</span><span class="lines">@@ -1,18 +1,20 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS missing value default: "2,2,10,10" (null)
</span><del>-FAIL missing value default: "20,40,10" (null) assert_equals: elementFromPoint(21, 41) expected Element node <img src="/images/threecolors.png" usemap="#x" id="img" w... but got Element node <area id="area" shape="null" coords="20,40,10"></area>
</del><ins>+PASS missing value default: "20,40,10" (null)
</ins><span class="cx"> PASS missing value default: null (null)
</span><span class="cx"> PASS invalid value default: "2,2,10,10" (foobar invalid)
</span><span class="cx"> PASS invalid value default: "2,2,10,10" ()
</span><span class="cx"> PASS empty string: "" (default)
</span><span class="cx"> PASS omitted coords: null (DEFAULT)
</span><ins>+PASS simple: "2,2,10,10" (rect)
+PASS simple: "2,2,10,10" (rectangle)
</ins><span class="cx"> PASS simple: "20,40,10" (circle)
</span><span class="cx"> PASS simple: "20,40,10" (circ)
</span><span class="cx"> PASS simple: "20,40,10" (CIRCLE)
</span><span class="cx"> PASS simple: "20,40,10" (CIRC)
</span><del>-FAIL LATIN CAPITAL LETTER I WITH DOT ABOVE: "20,40,10" (CİRCLE) assert_equals: elementFromPoint(21, 41) expected Element node <img src="/images/threecolors.png" usemap="#x" id="img" w... but got Element node <area id="area" shape="CİRCLE" coords="20,40,10"></area>
-FAIL LATIN SMALL LETTER DOTLESS I: "20,40,10" (cırcle) assert_equals: elementFromPoint(21, 41) expected Element node <img src="/images/threecolors.png" usemap="#x" id="img" w... but got Element node <area id="area" shape="cırcle" coords="20,40,10"></area>
</del><ins>+PASS LATIN CAPITAL LETTER I WITH DOT ABOVE: "20,40,10" (CİRCLE)
+PASS LATIN SMALL LETTER DOTLESS I: "20,40,10" (cırcle)
</ins><span class="cx"> PASS simple: "100,100,120,100,100,120" (poly)
</span><span class="cx"> PASS simple: "100,100,120,100,100,120" (polygon)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontenttheareaelementareashapehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape.html (205561 => 205562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape.html 2016-09-07 19:45:52 UTC (rev 205561)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape.html 2016-09-07 19:47:14 UTC (rev 205562)
</span><span class="lines">@@ -20,6 +20,9 @@
</span><span class="cx"> {desc: 'empty string', shape: 'default', coords: "", hit: hitAll},
</span><span class="cx"> {desc: 'omitted coords', shape: 'DEFAULT', coords: null, hit: hitAll},
</span><span class="cx">
</span><ins>+ {desc: 'simple', shape: 'rect', coords: "2,2,10,10", hit: hitRect},
+ {desc: 'simple', shape: 'rectangle', coords: "2,2,10,10", hit: hitRect},
+
</ins><span class="cx"> {desc: 'simple', shape: 'circle', coords: "20,40,10", hit: hitCircle},
</span><span class="cx"> {desc: 'simple', shape: 'circ', coords: "20,40,10", hit: hitCircle},
</span><span class="cx"> {desc: 'simple', shape: 'CIRCLE', coords: "20,40,10", hit: hitCircle},
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205561 => 205562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-07 19:45:52 UTC (rev 205561)
+++ trunk/Source/WebCore/ChangeLog 2016-09-07 19:47:14 UTC (rev 205562)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-09-07 Chris Dumez <cdumez@apple.com>
+
+ Align HTMLAreaElement shape parsing with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=161698
+
+ Reviewed by Daniel Bates.
+
+ Align HTMLAreaElement shape parsing with the specification:
+ - https://html.spec.whatwg.org/#attr-area-shape
+
+ In particular, add support for circ / polygon non conforming shapes
+ and use rectangle as default state.
+
+ This also aligns our behavior with Chrome.
+
+ No new tests, rebaselined existing test.
+
+ * html/HTMLAreaElement.cpp:
+ (WebCore::HTMLAreaElement::parseAttribute):
+
</ins><span class="cx"> 2016-09-07 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix WebCore build when building for device with iOS 10 beta SDK
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAreaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAreaElement.cpp (205561 => 205562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAreaElement.cpp 2016-09-07 19:45:52 UTC (rev 205561)
+++ trunk/Source/WebCore/html/HTMLAreaElement.cpp 2016-09-07 19:47:14 UTC (rev 205562)
</span><span class="lines">@@ -54,12 +54,14 @@
</span><span class="cx"> if (name == shapeAttr) {
</span><span class="cx"> if (equalLettersIgnoringASCIICase(value, "default"))
</span><span class="cx"> m_shape = Default;
</span><del>- else if (equalLettersIgnoringASCIICase(value, "circle"))
</del><ins>+ else if (equalLettersIgnoringASCIICase(value, "circle") || equalLettersIgnoringASCIICase(value, "circ"))
</ins><span class="cx"> m_shape = Circle;
</span><del>- else if (equalLettersIgnoringASCIICase(value, "poly"))
</del><ins>+ else if (equalLettersIgnoringASCIICase(value, "poly") || equalLettersIgnoringASCIICase(value, "polygon"))
</ins><span class="cx"> m_shape = Poly;
</span><del>- else if (equalLettersIgnoringASCIICase(value, "rect"))
</del><ins>+ else {
+ // The missing value default is the rectangle state.
</ins><span class="cx"> m_shape = Rect;
</span><ins>+ }
</ins><span class="cx"> invalidateCachedRegion();
</span><span class="cx"> } else if (name == coordsAttr) {
</span><span class="cx"> m_coords = parseHTMLListOfOfFloatingPointNumberValues(value.string());
</span></span></pre>
</div>
</div>
</body>
</html>