<!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>[197727] 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/197727">197727</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-03-07 22:42:51 -0800 (Mon, 07 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Align HTMLCanvasElement.width / height with the specification
https://bugs.webkit.org/show_bug.cgi?id=155156
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline now that more checks are passing.
* web-platform-tests/html/dom/reflection-embedded-expected.txt:
Source/WebCore:
Align HTMLCanvasElement.width / height with the specification:
- https://html.spec.whatwg.org/multipage/scripting.html#dom-canvas-width
- https://html.spec.whatwg.org/multipage/scripting.html#attr-canvas-width
In particular, the following changes were made:
1. The attributes are now 'unsigned long' instead of 'long'
2. The corresponding content attributes are parsed as per the HTML rules
for passing non-negative integers.
3. Upon setting, if the value is out-of-range, the content attributes is
set to its default value.
No new tests, already covered by existing test.
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::setHeight):
(WebCore::HTMLCanvasElement::setWidth):
(WebCore::HTMLCanvasElement::reset):
* html/HTMLCanvasElement.h:
* html/HTMLCanvasElement.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldomreflectionembeddedexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/reflection-embedded-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementh">trunk/Source/WebCore/html/HTMLCanvasElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementidl">trunk/Source/WebCore/html/HTMLCanvasElement.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (197726 => 197727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog        2016-03-08 06:38:10 UTC (rev 197726)
+++ trunk/LayoutTests/imported/w3c/ChangeLog        2016-03-08 06:42:51 UTC (rev 197727)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-03-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Align HTMLCanvasElement.width / height with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=155156
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline now that more checks are passing.
+
+ * web-platform-tests/html/dom/reflection-embedded-expected.txt:
+
+2016-03-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Stop clamping HTMLElement.tabIndex to the range of a short
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155159
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldomreflectionembeddedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/reflection-embedded-expected.txt (197726 => 197727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/reflection-embedded-expected.txt        2016-03-08 06:38:10 UTC (rev 197726)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/reflection-embedded-expected.txt        2016-03-08 06:42:51 UTC (rev 197727)
</span><span class="lines">@@ -14514,7 +14514,7 @@
</span><span class="cx"> PASS canvas.width: setAttribute() to "\t7" followed by getAttribute()
</span><span class="cx"> PASS canvas.width: setAttribute() to "\t7" followed by IDL get
</span><span class="cx"> PASS canvas.width: setAttribute() to "\v7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to "\v7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to "\v7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to "\f7" followed by getAttribute()
</span><span class="cx"> PASS canvas.width: setAttribute() to "\f7" followed by IDL get
</span><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><span class="lines">@@ -14528,39 +14528,39 @@
</span><span class="cx"> PASS canvas.width: setAttribute() to "\r7" followed by getAttribute()
</span><span class="cx"> PASS canvas.width: setAttribute() to "\r7" followed by IDL get
</span><span class="cx"> PASS canvas.width: setAttribute() to "
7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to "
7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to "
7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to "
7" followed by getAttribute()
</span><span class="cx"> PASS canvas.width: setAttribute() to "
7" followed by IDL get
</span><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to "7" followed by getAttribute()
</span><span class="cx"> PASS canvas.width: setAttribute() to "7" followed by IDL get
</span><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by IDL get
</span><span class="cx"> PASS canvas.width: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.width: setAttribute() to " 7" followed by IDL get assert_equals: expected 300 but got 7
</del><ins>+PASS canvas.width: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.width: setAttribute() to " \0\x01\x02\x03\x04\x05\x06\x07 \b\t\n\v\f\r\x0e\x0f \x10\x11\x12\x13\x14\x15\x16\x17 \x18\x19\x1a\x1b\x1c\x1d\x1e\x1f foo " followed by getAttribute()
</span><span class="cx"> PASS canvas.width: setAttribute() to " \0\x01\x02\x03\x04\x05\x06\x07 \b\t\n\v\f\r\x0e\x0f \x10\x11\x12\x13\x14\x15\x16\x17 \x18\x19\x1a\x1b\x1c\x1d\x1e\x1f foo " followed by IDL get
</span><span class="cx"> PASS canvas.width: setAttribute() to undefined followed by getAttribute()
</span><span class="lines">@@ -14598,10 +14598,10 @@
</span><span class="cx"> PASS canvas.width: IDL set to "-0" followed by getAttribute()
</span><span class="cx"> PASS canvas.width: IDL set to "-0" followed by IDL get
</span><span class="cx"> PASS canvas.width: IDL set to 2147483648 should not throw
</span><del>-FAIL canvas.width: IDL set to 2147483648 followed by getAttribute() assert_equals: expected "300" but got "-2147483648"
</del><ins>+PASS canvas.width: IDL set to 2147483648 followed by getAttribute()
</ins><span class="cx"> PASS canvas.width: IDL set to 2147483648 followed by IDL get
</span><span class="cx"> PASS canvas.width: IDL set to 4294967295 should not throw
</span><del>-FAIL canvas.width: IDL set to 4294967295 followed by getAttribute() assert_equals: expected "300" but got "-1"
</del><ins>+PASS canvas.width: IDL set to 4294967295 followed by getAttribute()
</ins><span class="cx"> PASS canvas.width: IDL set to 4294967295 followed by IDL get
</span><span class="cx"> PASS canvas.height: typeof IDL attribute
</span><span class="cx"> PASS canvas.height: IDL get with DOM attribute unset
</span><span class="lines">@@ -14638,7 +14638,7 @@
</span><span class="cx"> PASS canvas.height: setAttribute() to "\t7" followed by getAttribute()
</span><span class="cx"> PASS canvas.height: setAttribute() to "\t7" followed by IDL get
</span><span class="cx"> PASS canvas.height: setAttribute() to "\v7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to "\v7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to "\v7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to "\f7" followed by getAttribute()
</span><span class="cx"> PASS canvas.height: setAttribute() to "\f7" followed by IDL get
</span><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><span class="lines">@@ -14652,39 +14652,39 @@
</span><span class="cx"> PASS canvas.height: setAttribute() to "\r7" followed by getAttribute()
</span><span class="cx"> PASS canvas.height: setAttribute() to "\r7" followed by IDL get
</span><span class="cx"> PASS canvas.height: setAttribute() to "
7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to "
7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to "
7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to "
7" followed by getAttribute()
</span><span class="cx"> PASS canvas.height: setAttribute() to "
7" followed by IDL get
</span><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to "7" followed by getAttribute()
</span><span class="cx"> PASS canvas.height: setAttribute() to "7" followed by IDL get
</span><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by IDL get
</span><span class="cx"> PASS canvas.height: setAttribute() to " 7" followed by getAttribute()
</span><del>-FAIL canvas.height: setAttribute() to " 7" followed by IDL get assert_equals: expected 150 but got 7
</del><ins>+PASS canvas.height: setAttribute() to " 7" followed by IDL get
</ins><span class="cx"> PASS canvas.height: setAttribute() to " \0\x01\x02\x03\x04\x05\x06\x07 \b\t\n\v\f\r\x0e\x0f \x10\x11\x12\x13\x14\x15\x16\x17 \x18\x19\x1a\x1b\x1c\x1d\x1e\x1f foo " followed by getAttribute()
</span><span class="cx"> PASS canvas.height: setAttribute() to " \0\x01\x02\x03\x04\x05\x06\x07 \b\t\n\v\f\r\x0e\x0f \x10\x11\x12\x13\x14\x15\x16\x17 \x18\x19\x1a\x1b\x1c\x1d\x1e\x1f foo " followed by IDL get
</span><span class="cx"> PASS canvas.height: setAttribute() to undefined followed by getAttribute()
</span><span class="lines">@@ -14722,10 +14722,10 @@
</span><span class="cx"> PASS canvas.height: IDL set to "-0" followed by getAttribute()
</span><span class="cx"> PASS canvas.height: IDL set to "-0" followed by IDL get
</span><span class="cx"> PASS canvas.height: IDL set to 2147483648 should not throw
</span><del>-FAIL canvas.height: IDL set to 2147483648 followed by getAttribute() assert_equals: expected "150" but got "-2147483648"
</del><ins>+PASS canvas.height: IDL set to 2147483648 followed by getAttribute()
</ins><span class="cx"> PASS canvas.height: IDL set to 2147483648 followed by IDL get
</span><span class="cx"> PASS canvas.height: IDL set to 4294967295 should not throw
</span><del>-FAIL canvas.height: IDL set to 4294967295 followed by getAttribute() assert_equals: expected "150" but got "-1"
</del><ins>+PASS canvas.height: IDL set to 4294967295 followed by getAttribute()
</ins><span class="cx"> PASS canvas.height: IDL set to 4294967295 followed by IDL get
</span><span class="cx"> FAIL canvas.itemScope: typeof IDL attribute assert_equals: expected "boolean" but got "undefined"
</span><span class="cx"> FAIL canvas.itemScope: IDL get with DOM attribute unset assert_equals: expected (boolean) false but got (undefined) undefined
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197726 => 197727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-03-08 06:38:10 UTC (rev 197726)
+++ trunk/Source/WebCore/ChangeLog        2016-03-08 06:42:51 UTC (rev 197727)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-03-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Align HTMLCanvasElement.width / height with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=155156
+
+ Reviewed by Ryosuke Niwa.
+
+ Align HTMLCanvasElement.width / height with the specification:
+ - https://html.spec.whatwg.org/multipage/scripting.html#dom-canvas-width
+ - https://html.spec.whatwg.org/multipage/scripting.html#attr-canvas-width
+
+ In particular, the following changes were made:
+ 1. The attributes are now 'unsigned long' instead of 'long'
+ 2. The corresponding content attributes are parsed as per the HTML rules
+ for passing non-negative integers.
+ 3. Upon setting, if the value is out-of-range, the content attributes is
+ set to its default value.
+
+ No new tests, already covered by existing test.
+
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::setHeight):
+ (WebCore::HTMLCanvasElement::setWidth):
+ (WebCore::HTMLCanvasElement::reset):
+ * html/HTMLCanvasElement.h:
+ * html/HTMLCanvasElement.idl:
+
+2016-03-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Stop clamping HTMLElement.tabIndex to the range of a short
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155159
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (197726 => 197727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp        2016-03-08 06:38:10 UTC (rev 197726)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp        2016-03-08 06:42:51 UTC (rev 197727)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "GeometryUtilities.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><ins>+#include "HTMLParserIdioms.h"
</ins><span class="cx"> #include "ImageData.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -155,14 +156,14 @@
</span><span class="cx"> m_observers.remove(&observer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLCanvasElement::setHeight(int value)
</del><ins>+void HTMLCanvasElement::setHeight(unsigned value)
</ins><span class="cx"> {
</span><del>- setIntegralAttribute(heightAttr, value);
</del><ins>+ setAttributeWithoutSynchronization(heightAttr, AtomicString::number(limitToOnlyHTMLNonNegative(value, DefaultHeight)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLCanvasElement::setWidth(int value)
</del><ins>+void HTMLCanvasElement::setWidth(unsigned value)
</ins><span class="cx"> {
</span><del>- setIntegralAttribute(widthAttr, value);
</del><ins>+ setAttributeWithoutSynchronization(widthAttr, AtomicString::number(limitToOnlyHTMLNonNegative(value, DefaultWidth)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="lines">@@ -330,17 +331,11 @@
</span><span class="cx"> if (m_ignoreReset)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool ok;
</del><span class="cx"> bool hadImageBuffer = hasCreatedImageBuffer();
</span><span class="cx">
</span><del>- int w = getAttribute(widthAttr).toInt(&ok);
- if (!ok || w < 0)
- w = DefaultWidth;
</del><ins>+ int w = limitToOnlyHTMLNonNegative(fastGetAttribute(widthAttr), DefaultWidth);
+ int h = limitToOnlyHTMLNonNegative(fastGetAttribute(heightAttr), DefaultHeight);
</ins><span class="cx">
</span><del>- int h = getAttribute(heightAttr).toInt(&ok);
- if (!ok || h < 0)
- h = DefaultHeight;
-
</del><span class="cx"> if (m_contextStateSaver) {
</span><span class="cx"> // Reset to the initial graphics context state.
</span><span class="cx"> m_contextStateSaver->restore();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (197726 => 197727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h        2016-03-08 06:38:10 UTC (rev 197726)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h        2016-03-08 06:42:51 UTC (rev 197727)
</span><span class="lines">@@ -75,13 +75,13 @@
</span><span class="cx"> void removeObserver(CanvasObserver&);
</span><span class="cx">
</span><span class="cx"> // Attributes and functions exposed to script
</span><del>- int width() const { return size().width(); }
- int height() const { return size().height(); }
</del><ins>+ unsigned width() const { return size().width(); }
+ unsigned height() const { return size().height(); }
</ins><span class="cx">
</span><span class="cx"> const IntSize& size() const { return m_size; }
</span><span class="cx">
</span><del>- void setWidth(int);
- void setHeight(int);
</del><ins>+ void setWidth(unsigned);
+ void setHeight(unsigned);
</ins><span class="cx">
</span><span class="cx"> void setSize(const IntSize& newSize)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.idl (197726 => 197727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.idl        2016-03-08 06:38:10 UTC (rev 197726)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.idl        2016-03-08 06:42:51 UTC (rev 197727)
</span><span class="lines">@@ -28,9 +28,13 @@
</span><span class="cx"> JSGenerateToNativeObject,
</span><span class="cx"> ReportExtraMemoryCost
</span><span class="cx"> ] interface HTMLCanvasElement : HTMLElement {
</span><del>-
</del><ins>+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
</ins><span class="cx"> attribute long width;
</span><span class="cx"> attribute long height;
</span><ins>+#else
+ attribute unsigned long width;
+ attribute unsigned long height;
+#endif
</ins><span class="cx">
</span><span class="cx"> [Custom, RaisesException] DOMString toDataURL(optional DOMString? type);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>