<!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>[209373] 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/209373">209373</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-12-05 18:19:40 -0800 (Mon, 05 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaDocuments crash with modern media controls
https://bugs.webkit.org/show_bug.cgi?id=165446
<rdar://problem/29524959>
Reviewed by Antoine Quint.
Source/WebCore:
The modern media controls inject a <style> element into
the document, which exposed a bug when used in MediaDocuments.
Such documents were not getting a charset, and the hash table
for the CSSParserContexts was crashing.
Test: media/modern-media-controls/media-documents/insert-style-should-not-crash.html
* css/parser/CSSParserMode.h: Guard against an empty charset.
(WebCore::CSSParserContextHash::hash):
* dom/InlineStyleSheetOwner.cpp: Ask for the charset with fallback.
(WebCore::parserContextForElement):
LayoutTests:
* media/modern-media-controls/media-documents/insert-style-should-not-crash-expected.txt: Added.
* media/modern-media-controls/media-documents/insert-style-should-not-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserModeh">trunk/Source/WebCore/css/parser/CSSParserMode.h</a></li>
<li><a href="#trunkSourceWebCoredomInlineStyleSheetOwnercpp">trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/media/modern-media-controls/media-documents/</li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediadocumentsinsertstyleshouldnotcrashexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediadocumentsinsertstyleshouldnotcrashhtml">trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209372 => 209373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-06 02:08:20 UTC (rev 209372)
+++ trunk/LayoutTests/ChangeLog 2016-12-06 02:19:40 UTC (rev 209373)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-05 Dean Jackson <dino@apple.com>
+
+ MediaDocuments crash with modern media controls
+ https://bugs.webkit.org/show_bug.cgi?id=165446
+ <rdar://problem/29524959>
+
+ Reviewed by Antoine Quint.
+
+ * media/modern-media-controls/media-documents/insert-style-should-not-crash-expected.txt: Added.
+ * media/modern-media-controls/media-documents/insert-style-should-not-crash.html: Added.
+
</ins><span class="cx"> 2016-12-05 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Avoid more tests
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediadocumentsinsertstyleshouldnotcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash-expected.txt (0 => 209373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash-expected.txt 2016-12-06 02:19:40 UTC (rev 209373)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Date Revision
</ins><span class="cx">\ No newline at end of property
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+text/plain
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsmediamodernmediacontrolsmediadocumentsinsertstyleshouldnotcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash.html (0 => 209373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash.html 2016-12-06 02:19:40 UTC (rev 209373)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<!DOCTYPE html><!-- webkit-test-runner [ modernMediaControls=true ] -->
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<iframe src="../../content/test.mp4"></iframe>
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/modern-media-controls/media-documents/insert-style-should-not-crash.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Date Revision
</ins><span class="cx">\ No newline at end of property
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+text/html
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209372 => 209373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-06 02:08:20 UTC (rev 209372)
+++ trunk/Source/WebCore/ChangeLog 2016-12-06 02:19:40 UTC (rev 209373)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-12-05 Dean Jackson <dino@apple.com>
+
+ MediaDocuments crash with modern media controls
+ https://bugs.webkit.org/show_bug.cgi?id=165446
+ <rdar://problem/29524959>
+
+ Reviewed by Antoine Quint.
+
+ The modern media controls inject a <style> element into
+ the document, which exposed a bug when used in MediaDocuments.
+ Such documents were not getting a charset, and the hash table
+ for the CSSParserContexts was crashing.
+
+ Test: media/modern-media-controls/media-documents/insert-style-should-not-crash.html
+
+ * css/parser/CSSParserMode.h: Guard against an empty charset.
+ (WebCore::CSSParserContextHash::hash):
+ * dom/InlineStyleSheetOwner.cpp: Ask for the charset with fallback.
+ (WebCore::parserContextForElement):
+
</ins><span class="cx"> 2016-12-05 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] shape-rendering supports crispEdges rather than crisp-edges
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserMode.h (209372 => 209373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserMode.h 2016-12-06 02:08:20 UTC (rev 209372)
+++ trunk/Source/WebCore/css/parser/CSSParserMode.h 2016-12-06 02:19:40 UTC (rev 209373)
</span><span class="lines">@@ -131,7 +131,8 @@
</span><span class="cx"> static unsigned hash(const CSSParserContext& key)
</span><span class="cx"> {
</span><span class="cx"> auto hash = URLHash::hash(key.baseURL);
</span><del>- hash ^= StringHash::hash(key.charset);
</del><ins>+ if (!key.charset.isEmpty())
+ hash ^= StringHash::hash(key.charset);
</ins><span class="cx"> unsigned bits = key.isHTMLDocument << 0
</span><span class="cx"> & key.isHTMLDocument << 1
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span></span></pre></div>
<a id="trunkSourceWebCoredomInlineStyleSheetOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp (209372 => 209373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2016-12-06 02:08:20 UTC (rev 209372)
+++ trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2016-12-06 02:19:40 UTC (rev 209373)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> // User agent shadow trees can't contain document-relative URLs. Use blank URL as base allowing cross-document sharing.
</span><span class="cx"> auto& baseURL = shadowRoot && shadowRoot->mode() == ShadowRootMode::UserAgent ? blankURL() : element.document().baseURL();
</span><span class="cx">
</span><del>- CSSParserContext result = CSSParserContext { element.document(), baseURL, element.document().encoding() };
</del><ins>+ CSSParserContext result = CSSParserContext { element.document(), baseURL, element.document().characterSetWithUTF8Fallback() };
</ins><span class="cx"> if (shadowRoot && shadowRoot->mode() == ShadowRootMode::UserAgent)
</span><span class="cx"> result.mode = UASheetMode;
</span><span class="cx"> return result;
</span></span></pre>
</div>
</div>
</body>
</html>