<!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>[208321] 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/208321">208321</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-11-02 20:25:28 -0700 (Wed, 02 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSS.supports("font-variation-settings", "'wght' 500") erroneously returns false
https://bugs.webkit.org/show_bug.cgi?id=164244
Reviewed by Michael Catanzaro.
Source/WebCore:
Because we weren't passing a Document into CSSParserContext's constructor,
there was no way for our parser to know whether the runtime switch was on
or not. Instead, we can use the CallWith attribute in the IDL file to pass
in a Document.
Test: fast/text/variations/css-supports-runtime-switch.html
* css/DOMCSSNamespace.cpp:
(WebCore::DOMCSSNamespace::supports):
* css/DOMCSSNamespace.h:
* css/DOMCSSNamespace.idl:
LayoutTests:
* fast/text/variations/css-supports-runtime-switch-expected.txt: Added.
* fast/text/variations/css-supports-runtime-switch.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="#trunkSourceWebCorecssDOMCSSNamespacecpp">trunk/Source/WebCore/css/DOMCSSNamespace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDOMCSSNamespaceh">trunk/Source/WebCore/css/DOMCSSNamespace.h</a></li>
<li><a href="#trunkSourceWebCorecssDOMCSSNamespaceidl">trunk/Source/WebCore/css/DOMCSSNamespace.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3csssupportsdocumentparsercontextexpectedtxt">trunk/LayoutTests/css3/css-supports-document-parser-context-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3csssupportsdocumentparsercontexthtml">trunk/LayoutTests/css3/css-supports-document-parser-context.html</a></li>
<li><a href="#trunkLayoutTestscss3resourcescsssupportsdocumentparsercontextnonstricthtml">trunk/LayoutTests/css3/resources/css-supports-document-parser-context-nonstrict.html</a></li>
<li><a href="#trunkLayoutTestscss3resourcescsssupportsdocumentparsercontextstricthtml">trunk/LayoutTests/css3/resources/css-supports-document-parser-context-strict.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208320 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-03 03:20:53 UTC (rev 208320)
+++ trunk/LayoutTests/ChangeLog 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-11-02 Myles C. Maxfield <mmaxfield@apple.com>
+
+ CSS.supports("font-variation-settings", "'wght' 500") erroneously returns false
+ https://bugs.webkit.org/show_bug.cgi?id=164244
+
+ Reviewed by Michael Catanzaro.
+
+ * fast/text/variations/css-supports-runtime-switch-expected.txt: Added.
+ * fast/text/variations/css-supports-runtime-switch.html: Added.
+
</ins><span class="cx"> 2016-11-02 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT] Add DOMJIT::Signature
</span></span></pre></div>
<a id="trunkLayoutTestscss3csssupportsdocumentparsercontextexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/css-supports-document-parser-context-expected.txt (0 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/css-supports-document-parser-context-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/css-supports-document-parser-context-expected.txt 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Makes sure that CSS.supports() is parsed within the context of the owning document.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.test1 is false
+PASS document.test2 is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3csssupportsdocumentparsercontexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/css-supports-document-parser-context.html (0 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/css-supports-document-parser-context.html (rev 0)
+++ trunk/LayoutTests/css3/css-supports-document-parser-context.html 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+description("Makes sure that CSS.supports() is parsed within the context of the owning document.")
+
+document.test1 = undefined;
+document.test2 = undefined;
+
+window.jsTestIsAsync = true;
+</script>
+<iframe id="frame1" src="resources/css-supports-document-parser-context-strict.html"></iframe>
+<iframe id="frame2" src="resources/css-supports-document-parser-context-nonstrict.html"></iframe>
+<script>
+var frame1 = document.getElementById("frame1");
+var frame2 = document.getElementById("frame2");
+
+var counter = 0;
+function listener() {
+ ++counter;
+ if (counter == 2) {
+ shouldBeFalse("document.test1");
+ shouldBeTrue("document.test2");
+ finishJSTest();
+ }
+}
+frame1.addEventListener("load", listener);
+frame2.addEventListener("load", listener);
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3resourcescsssupportsdocumentparsercontextnonstricthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/resources/css-supports-document-parser-context-nonstrict.html (0 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/resources/css-supports-document-parser-context-nonstrict.html (rev 0)
+++ trunk/LayoutTests/css3/resources/css-supports-document-parser-context-nonstrict.html 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+shouldBeTrue("CSS.supports('color', '-webkit-focus-ring-color')");
+window.parent.document.test2 = CSS.supports('color', '-webkit-focus-ring-color');
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3resourcescsssupportsdocumentparsercontextstricthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/resources/css-supports-document-parser-context-strict.html (0 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/resources/css-supports-document-parser-context-strict.html (rev 0)
+++ trunk/LayoutTests/css3/resources/css-supports-document-parser-context-strict.html 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+shouldBeFalse("CSS.supports('color', '-webkit-focus-ring-color')");
+window.parent.document.test1 = CSS.supports('color', '-webkit-focus-ring-color');
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208320 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-03 03:20:53 UTC (rev 208320)
+++ trunk/Source/WebCore/ChangeLog 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-11-02 Myles C. Maxfield <mmaxfield@apple.com>
+
+ CSS.supports("font-variation-settings", "'wght' 500") erroneously returns false
+ https://bugs.webkit.org/show_bug.cgi?id=164244
+
+ Reviewed by Michael Catanzaro.
+
+ Because we weren't passing a Document into CSSParserContext's constructor,
+ there was no way for our parser to know whether the runtime switch was on
+ or not. Instead, we can use the CallWith attribute in the IDL file to pass
+ in a Document.
+
+ Test: fast/text/variations/css-supports-runtime-switch.html
+
+ * css/DOMCSSNamespace.cpp:
+ (WebCore::DOMCSSNamespace::supports):
+ * css/DOMCSSNamespace.h:
+ * css/DOMCSSNamespace.idl:
+
</ins><span class="cx"> 2016-11-02 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT] Add DOMJIT::Signature
</span></span></pre></div>
<a id="trunkSourceWebCorecssDOMCSSNamespacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMCSSNamespace.cpp (208320 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMCSSNamespace.cpp 2016-11-03 03:20:53 UTC (rev 208320)
+++ trunk/Source/WebCore/css/DOMCSSNamespace.cpp 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> return newValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMCSSNamespace::supports(const String& property, const String& value)
</del><ins>+bool DOMCSSNamespace::supports(Document& document, const String& property, const String& value)
</ins><span class="cx"> {
</span><span class="cx"> CSSPropertyID propertyID = cssPropertyID(property.stripWhiteSpace());
</span><span class="cx">
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> auto dummyStyle = MutableStyleProperties::create();
</span><del>- return CSSParser::parseValue(dummyStyle, propertyID, normalizedValue, false, HTMLStandardMode, nullptr) != CSSParser::ParseResult::Error;
</del><ins>+ return CSSParser::parseValue(dummyStyle, propertyID, normalizedValue, false, document, nullptr) != CSSParser::ParseResult::Error;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMCSSNamespace::supports(const String& conditionText)
</del><ins>+bool DOMCSSNamespace::supports(Document& document, const String& conditionText)
</ins><span class="cx"> {
</span><del>- CSSParserContext context(HTMLStandardMode);
</del><ins>+ CSSParserContext context(document);
</ins><span class="cx"> CSSParser parser(context);
</span><span class="cx"> return parser.parseSupportsCondition(conditionText);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssDOMCSSNamespaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMCSSNamespace.h (208320 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMCSSNamespace.h 2016-11-03 03:20:53 UTC (rev 208320)
+++ trunk/Source/WebCore/css/DOMCSSNamespace.h 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -34,10 +34,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Document;
+
</ins><span class="cx"> class DOMCSSNamespace final : public RefCounted<DOMCSSNamespace> {
</span><span class="cx"> public:
</span><del>- static bool supports(const String& property, const String& value);
- static bool supports(const String& conditionText);
</del><ins>+ static bool supports(Document&, const String& property, const String& value);
+ static bool supports(Document&, const String& conditionText);
</ins><span class="cx"> static String escape(const String& ident);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssDOMCSSNamespaceidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMCSSNamespace.idl (208320 => 208321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMCSSNamespace.idl 2016-11-03 03:20:53 UTC (rev 208320)
+++ trunk/Source/WebCore/css/DOMCSSNamespace.idl 2016-11-03 03:25:28 UTC (rev 208321)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> InterfaceName=CSS,
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface DOMCSSNamespace {
</span><del>- static boolean supports(DOMString property, DOMString value);
- static boolean supports(DOMString conditionText);
</del><ins>+ [CallWith=Document] static boolean supports(DOMString property, DOMString value);
+ [CallWith=Document] static boolean supports(DOMString conditionText);
</ins><span class="cx"> static DOMString escape(DOMString ident);
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>