<!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>[206736] 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/206736">206736</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-10-03 10:44:29 -0700 (Mon, 03 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: result in WebCore::CSSParser::parseURI
https://bugs.webkit.org/show_bug.cgi?id=141638
<rdar://problem/27709952>
Reviewed by Andreas Kling.
Source/WebCore:
CSSParser::parseURIInternal() failed to parse unquoted URLs with Unicode escape sequences
greater than 0xFF, even when the destination character type was multi-byte. Fixed by
checking the size of DestCharacterType instead of SrcCharacterType.
Updated fast/css/url-with-multi-byte-unicode-escape.html to test for an unquoted URL.
* css/parser/CSSParser.cpp:
(WebCore::CSSParser::parseURIInternal): For code points greater than 0xFF, only returned
false if sizeof(DestCharacterType) == 1.
LayoutTests:
* fast/css/url-with-multi-byte-unicode-escape-expected.txt: Added a test for an unquoted URL.
* fast/css/url-with-multi-byte-unicode-escape.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssurlwithmultibyteunicodeescapeexpectedtxt">trunk/LayoutTests/fast/css/url-with-multi-byte-unicode-escape-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssurlwithmultibyteunicodeescapehtml">trunk/LayoutTests/fast/css/url-with-multi-byte-unicode-escape.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206735 => 206736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-03 17:28:04 UTC (rev 206735)
+++ trunk/LayoutTests/ChangeLog 2016-10-03 17:44:29 UTC (rev 206736)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-03 Andy Estes <aestes@apple.com>
+
+ ASSERTION FAILED: result in WebCore::CSSParser::parseURI
+ https://bugs.webkit.org/show_bug.cgi?id=141638
+ <rdar://problem/27709952>
+
+ Reviewed by Andreas Kling.
+
+ * fast/css/url-with-multi-byte-unicode-escape-expected.txt: Added a test for an unquoted URL.
+ * fast/css/url-with-multi-byte-unicode-escape.html:
+
</ins><span class="cx"> 2016-10-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> td.scope should only return known values
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssurlwithmultibyteunicodeescapeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/url-with-multi-byte-unicode-escape-expected.txt (206735 => 206736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/url-with-multi-byte-unicode-escape-expected.txt 2016-10-03 17:28:04 UTC (rev 206735)
+++ trunk/LayoutTests/fast/css/url-with-multi-byte-unicode-escape-expected.txt 2016-10-03 17:44:29 UTC (rev 206736)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS document.styleSheets[0].cssRules.length is 2
</span><span class="cx"> PASS document.styleSheets[0].cssRules[0].style.getPropertyValue("background-image") is "url(data:%C4%80)"
</span><ins>+PASS document.styleSheets[0].cssRules[0].style.getPropertyValue("border-image-source") is "url(data:%C4%80)"
</ins><span class="cx"> PASS document.styleSheets[0].cssRules[1].style.getPropertyValue("background-color") is "green"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById("test")).getPropertyValue("background-color") is "rgb(0, 128, 0)"
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssurlwithmultibyteunicodeescapehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/url-with-multi-byte-unicode-escape.html (206735 => 206736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/url-with-multi-byte-unicode-escape.html 2016-10-03 17:28:04 UTC (rev 206735)
+++ trunk/LayoutTests/fast/css/url-with-multi-byte-unicode-escape.html 2016-10-03 17:44:29 UTC (rev 206736)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<style>#test { background-image: url("data:\100")} #test { background-color: green !important }</style>
</del><ins>+<style>#test { background-image: url("data:\100"); border-image: url(data:\100); } #test { background-color: green !important; }</style>
</ins><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> description('Test parsing a CSS URI containing a multi-byte Unicode escape sequence.');
</span><span class="cx"> shouldBe('document.styleSheets[0].cssRules.length', '2');
</span><span class="cx"> shouldBeEqualToString('document.styleSheets[0].cssRules[0].style.getPropertyValue("background-image")', 'url(data:%C4%80)');
</span><ins>+ shouldBeEqualToString('document.styleSheets[0].cssRules[0].style.getPropertyValue("border-image-source")', 'url(data:%C4%80)');
</ins><span class="cx"> shouldBeEqualToString('document.styleSheets[0].cssRules[1].style.getPropertyValue("background-color")', 'green');
</span><span class="cx"> shouldBeEqualToString('window.getComputedStyle(document.getElementById("test")).getPropertyValue("background-color")', 'rgb(0, 128, 0)');
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206735 => 206736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-03 17:28:04 UTC (rev 206735)
+++ trunk/Source/WebCore/ChangeLog 2016-10-03 17:44:29 UTC (rev 206736)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-03 Andy Estes <aestes@apple.com>
+
+ ASSERTION FAILED: result in WebCore::CSSParser::parseURI
+ https://bugs.webkit.org/show_bug.cgi?id=141638
+ <rdar://problem/27709952>
+
+ Reviewed by Andreas Kling.
+
+ CSSParser::parseURIInternal() failed to parse unquoted URLs with Unicode escape sequences
+ greater than 0xFF, even when the destination character type was multi-byte. Fixed by
+ checking the size of DestCharacterType instead of SrcCharacterType.
+
+ Updated fast/css/url-with-multi-byte-unicode-escape.html to test for an unquoted URL.
+
+ * css/parser/CSSParser.cpp:
+ (WebCore::CSSParser::parseURIInternal): For code points greater than 0xFF, only returned
+ false if sizeof(DestCharacterType) == 1.
+
</ins><span class="cx"> 2016-10-03 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser: empty relative URLs should not copy fragment from the base URL
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (206735 => 206736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-10-03 17:28:04 UTC (rev 206735)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-10-03 17:44:29 UTC (rev 206736)
</span><span class="lines">@@ -11736,7 +11736,7 @@
</span><span class="cx"> *dest++ = *src++;
</span><span class="cx"> else {
</span><span class="cx"> unsigned unicode = parseEscape<SrcCharacterType>(src);
</span><del>- if (unicode > 0xff && sizeof(SrcCharacterType) == 1)
</del><ins>+ if (unicode > 0xff && sizeof(DestCharacterType) == 1)
</ins><span class="cx"> return false;
</span><span class="cx"> UnicodeToChars(dest, unicode);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>