<!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>[169413] 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/169413">169413</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-27 22:08:51 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/169400">r169400</a>.
https://bugs.webkit.org/show_bug.cgi?id=133338
Broke the iOS build in
LocalizedDateCache::calculateMaximumWidth() (Requested by smfr
on #webkit).
Reverted changeset:
"SVG TextRuns do not always get RenderingContexts"
https://bugs.webkit.org/show_bug.cgi?id=133198
http://trac.webkit.org/changeset/169400</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="#trunkSourceWebCoreplatformgraphicsTextRunh">trunk/Source/WebCore/platform/graphics/TextRun.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListMarkercpp">trunk/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcustomlistitemswithsvgfontfamilyexpectedtxt">trunk/LayoutTests/svg/custom/list-items-with-svg-font-family-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomlistitemswithsvgfontfamilyhtml">trunk/LayoutTests/svg/custom/list-items-with-svg-font-family.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169412 => 169413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-28 04:46:18 UTC (rev 169412)
+++ trunk/LayoutTests/ChangeLog 2014-05-28 05:08:51 UTC (rev 169413)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-27 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r169400.
+ https://bugs.webkit.org/show_bug.cgi?id=133338
+
+ Broke the iOS build in
+ LocalizedDateCache::calculateMaximumWidth() (Requested by smfr
+ on #webkit).
+
+ Reverted changeset:
+
+ "SVG TextRuns do not always get RenderingContexts"
+ https://bugs.webkit.org/show_bug.cgi?id=133198
+ http://trac.webkit.org/changeset/169400
+
</ins><span class="cx"> 2014-05-27 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> vw/vh units used as font/line-height values don't scale with the viewport
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomlistitemswithsvgfontfamilyexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/svg/custom/list-items-with-svg-font-family-expected.txt (169412 => 169413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/list-items-with-svg-font-family-expected.txt 2014-05-28 04:46:18 UTC (rev 169412)
+++ trunk/LayoutTests/svg/custom/list-items-with-svg-font-family-expected.txt 2014-05-28 05:08:51 UTC (rev 169413)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-This test makes sure that styling list elements with an SVG font does not cause a crash.
-This test is successful if there is no crash.
-element
-element
-element
</del></span></pre></div>
<a id="trunkLayoutTestssvgcustomlistitemswithsvgfontfamilyhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/svg/custom/list-items-with-svg-font-family.html (169412 => 169413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/list-items-with-svg-font-family.html 2014-05-28 04:46:18 UTC (rev 169412)
+++ trunk/LayoutTests/svg/custom/list-items-with-svg-font-family.html 2014-05-28 05:08:51 UTC (rev 169413)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-<style>
-@font-face {
- font-family: 'SVGraffiti';
- src: url("resources/graffiti.svg#SVGraffiti") format(svg)
-}
-li.a {
- font-size: 30px;
- font-family: SVGraffiti;
- list-style-type: lower-roman;
-}
-li.b {
- font-size: 30px;
- font-family: SVGraffiti;
- list-style-type: asterisks;
-}
-</style>
-This test makes sure that styling list elements with an SVG font does not cause a crash.
-<br>
-This test is successful if there is no crash.
-<ol>
-<li class="a">element</li>
-<li class="a">element</li>
-<li class="b">element</li>
-</ol>
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169412 => 169413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-28 04:46:18 UTC (rev 169412)
+++ trunk/Source/WebCore/ChangeLog 2014-05-28 05:08:51 UTC (rev 169413)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-27 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r169400.
+ https://bugs.webkit.org/show_bug.cgi?id=133338
+
+ Broke the iOS build in
+ LocalizedDateCache::calculateMaximumWidth() (Requested by smfr
+ on #webkit).
+
+ Reverted changeset:
+
+ "SVG TextRuns do not always get RenderingContexts"
+ https://bugs.webkit.org/show_bug.cgi?id=133198
+ http://trac.webkit.org/changeset/169400
+
</ins><span class="cx"> 2014-05-27 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (Margin tiles): Background gradient on dom.spec.whatwg.org is very slow to render
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTextRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TextRun.h (169412 => 169413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TextRun.h 2014-05-28 04:46:18 UTC (rev 169412)
+++ trunk/Source/WebCore/platform/graphics/TextRun.h 2014-05-28 05:08:51 UTC (rev 169413)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> m_data.characters16 = c;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- explicit TextRun(const String& s, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
</del><ins>+ TextRun(const String& s, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
</ins><span class="cx"> : m_charactersLength(s.length())
</span><span class="cx"> , m_len(s.length())
</span><span class="cx"> , m_xpos(xpos)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- explicit TextRun(StringView s, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
</del><ins>+ TextRun(StringView s, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
</ins><span class="cx"> : m_charactersLength(s.length())
</span><span class="cx"> , m_len(s.length())
</span><span class="cx"> , m_xpos(xpos)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (169412 => 169413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2014-05-28 04:46:18 UTC (rev 169412)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2014-05-28 05:08:51 UTC (rev 169413)
</span><span class="lines">@@ -1536,10 +1536,8 @@
</span><span class="cx"> case NoneListStyle:
</span><span class="cx"> break;
</span><span class="cx"> case Asterisks:
</span><del>- case Footnotes: {
- TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
- logicalWidth = font.width(run); // no suffix for these types
- }
</del><ins>+ case Footnotes:
+ logicalWidth = font.width(m_text); // no suffix for these types
</ins><span class="cx"> break;
</span><span class="cx"> case Circle:
</span><span class="cx"> case Disc:
</span><span class="lines">@@ -1624,8 +1622,7 @@
</span><span class="cx"> if (m_text.isEmpty())
</span><span class="cx"> logicalWidth = 0;
</span><span class="cx"> else {
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
- LayoutUnit itemWidth = font.width(run);
</del><ins>+ LayoutUnit itemWidth = font.width(m_text);
</ins><span class="cx"> UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem.value()), ' ' };
</span><span class="cx"> LayoutUnit suffixSpaceWidth = font.width(RenderBlock::constructTextRun(this, font, suffixSpace, 2, style()));
</span><span class="cx"> logicalWidth = itemWidth + suffixSpaceWidth;
</span><span class="lines">@@ -1757,8 +1754,7 @@
</span><span class="cx"> case Asterisks:
</span><span class="cx"> case Footnotes: {
</span><span class="cx"> const Font& font = style().font();
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
- relativeRect = IntRect(0, 0, font.width(run), font.fontMetrics().height());
</del><ins>+ relativeRect = IntRect(0, 0, font.width(m_text), font.fontMetrics().height());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case Disc:
</span><span class="lines">@@ -1851,8 +1847,7 @@
</span><span class="cx"> if (m_text.isEmpty())
</span><span class="cx"> return IntRect();
</span><span class="cx"> const Font& font = style().font();
</span><del>- TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
- int itemWidth = font.width(run);
</del><ins>+ int itemWidth = font.width(m_text);
</ins><span class="cx"> UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem.value()), ' ' };
</span><span class="cx"> int suffixSpaceWidth = font.width(RenderBlock::constructTextRun(this, font, suffixSpace, 2, style()));
</span><span class="cx"> relativeRect = IntRect(0, 0, itemWidth + suffixSpaceWidth, font.fontMetrics().height());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (169412 => 169413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2014-05-28 04:46:18 UTC (rev 169412)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2014-05-28 05:08:51 UTC (rev 169413)
</span><span class="lines">@@ -224,17 +224,11 @@
</span><span class="cx"> float optionWidth = 0;
</span><span class="cx"> if (RenderStyle* optionStyle = element->renderStyle())
</span><span class="cx"> optionWidth += minimumValueForLength(optionStyle->textIndent(), 0);
</span><del>- if (!text.isEmpty()) {
- const Font& font = style().font();
- TextRun run = RenderBlock::constructTextRun(this, font, text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
- optionWidth += font.width(run);
- }
</del><ins>+ if (!text.isEmpty())
+ optionWidth += style().font().width(text);
</ins><span class="cx"> maxOptionWidth = std::max(maxOptionWidth, optionWidth);
</span><del>- } else if (!text.isEmpty()) {
- const Font& font = style().font();
- TextRun run = RenderBlock::constructTextRun(this, font, text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
- maxOptionWidth = std::max(maxOptionWidth, font.width(run));
- }
</del><ins>+ } else if (!text.isEmpty())
+ maxOptionWidth = std::max(maxOptionWidth, style().font().width(text));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int width = static_cast<int>(ceilf(maxOptionWidth));
</span></span></pre>
</div>
</div>
</body>
</html>