<!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>[207726] 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/207726">207726</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-10-23 00:23:28 -0700 (Sun, 23 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: m_fonts in &WebCore::FontCascade::primaryFont
https://bugs.webkit.org/show_bug.cgi?id=163459
Reviewed by Darin Adler.
Source/WebCore:
The CSS Units and Values spec states that font-relative units, when used
in the font-size property, are resolved against the parent element. When
calc() is specified, we were trying to resolve them against the current
element, which is impossible because of the circular dependency. Instead,
we should resolve against the parent style the same way as when calc()
isn't specified.
Test: fast/text/font-size-calc.html
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueFontSize):
LayoutTests:
* fast/text/font-size-calc-expected.txt: Added.
* fast/text/font-size-calc.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="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextfontsizecalcexpectedtxt">trunk/LayoutTests/fast/text/font-size-calc-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontsizecalchtml">trunk/LayoutTests/fast/text/font-size-calc.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207725 => 207726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-23 05:06:19 UTC (rev 207725)
+++ trunk/LayoutTests/ChangeLog 2016-10-23 07:23:28 UTC (rev 207726)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-22 Myles C. Maxfield <mmaxfield@apple.com>
+
+ ASSERTION FAILED: m_fonts in &WebCore::FontCascade::primaryFont
+ https://bugs.webkit.org/show_bug.cgi?id=163459
+
+ Reviewed by Darin Adler.
+
+ * fast/text/font-size-calc-expected.txt: Added.
+ * fast/text/font-size-calc.html: Added.
+
</ins><span class="cx"> 2016-10-22 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Dynamically-added backdrop filter to clip-path'd element with 3D transform renders incorrectly (without clip)
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontsizecalcexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-size-calc-expected.txt (0 => 207726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-size-calc-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/font-size-calc-expected.txt 2016-10-23 07:23:28 UTC (rev 207726)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if there is no crash.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/text/font-size-calc-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>+Author Date Id Rev URL
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfasttextfontsizecalchtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-size-calc.html (0 => 207726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-size-calc.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-size-calc.html 2016-10-23 07:23:28 UTC (rev 207726)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+div {
+ font-size: calc(6% + 7ch);
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<div style="font-family: 'Helvetica';">This test passes if there is no crash.</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207725 => 207726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-23 05:06:19 UTC (rev 207725)
+++ trunk/Source/WebCore/ChangeLog 2016-10-23 07:23:28 UTC (rev 207726)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-22 Myles C. Maxfield <mmaxfield@apple.com>
+
+ ASSERTION FAILED: m_fonts in &WebCore::FontCascade::primaryFont
+ https://bugs.webkit.org/show_bug.cgi?id=163459
+
+ Reviewed by Darin Adler.
+
+ The CSS Units and Values spec states that font-relative units, when used
+ in the font-size property, are resolved against the parent element. When
+ calc() is specified, we were trying to resolve them against the current
+ element, which is impossible because of the circular dependency. Instead,
+ we should resolve against the parent style the same way as when calc()
+ isn't specified.
+
+ Test: fast/text/font-size-calc.html
+
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueFontSize):
+
</ins><span class="cx"> 2016-10-22 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web IDL] Two types are distinguishable for overload resolution if at most one of the two includes a nullable type
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (207725 => 207726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-10-23 05:06:19 UTC (rev 207725)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-10-23 07:23:28 UTC (rev 207726)
</span><span class="lines">@@ -1587,9 +1587,11 @@
</span><span class="cx"> styleResolver.state().setFontSizeHasViewportUnits(primitiveValue.isViewportPercentageLength());
</span><span class="cx"> } else if (primitiveValue.isPercentage())
</span><span class="cx"> size = (primitiveValue.floatValue() * parentSize) / 100.0f;
</span><del>- else if (primitiveValue.isCalculatedPercentageWithLength())
- size = primitiveValue.cssCalcValue()->createCalculationValue(styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f))->evaluate(parentSize);
- else
</del><ins>+ else if (primitiveValue.isCalculatedPercentageWithLength()) {
+ const auto& conversionData = styleResolver.state().cssToLengthConversionData();
+ CSSToLengthConversionData parentConversionData { styleResolver.parentStyle(), conversionData.rootStyle(), styleResolver.document().renderView(), 1.0f, true };
+ size = primitiveValue.cssCalcValue()->createCalculationValue(parentConversionData)->evaluate(parentSize);
+ } else
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>