<!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>[167628] 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/167628">167628</a></dd>
<dt>Author</dt> <dd>jhoneycutt@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 14:45:35 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Empty RenderInline objects should not be line break objects.
https://bugs.webkit.org/show_bug.cgi?id=131861
<rdar://problem/15663617>
Reviewed by David Hyatt.
.:
* ManualTests/empty-inline-as-line-break-position.html: Added.
This issue wouldn't reproduce in WebKitTestRunner.
Source/WebCore:
* rendering/line/BreakingContextInlineHeaders.h:
(WebCore::BreakingContext::canBreakAtThisPosition):
Don't break at this position if this is an empty RenderInline.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh">trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkManualTestsemptyinlineaslinebreakpositionhtml">trunk/ManualTests/empty-inline-as-line-break-position.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (167627 => 167628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2014-04-21 21:44:34 UTC (rev 167627)
+++ trunk/ChangeLog        2014-04-21 21:45:35 UTC (rev 167628)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-18 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Empty RenderInline objects should not be line break objects.
+
+ https://bugs.webkit.org/show_bug.cgi?id=131861
+ <rdar://problem/15663617>
+
+ Reviewed by David Hyatt.
+
+ * ManualTests/empty-inline-as-line-break-position.html: Added.
+ This issue wouldn't reproduce in WebKitTestRunner.
+
</ins><span class="cx"> 2014-04-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert unintended workspace change in my last commit.
</span></span></pre></div>
<a id="trunkManualTestsemptyinlineaslinebreakpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/ManualTests/empty-inline-as-line-break-position.html (0 => 167628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/empty-inline-as-line-break-position.html         (rev 0)
+++ trunk/ManualTests/empty-inline-as-line-break-position.html        2014-04-21 21:45:35 UTC (rev 167628)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<div>
+ WebKit bug #<a href="https://bugs.webkit.org/show_bug.cgi?id=131861">131861</a>: Empty inlines should not be line break objects. This test must be run manually. On success, you will see "Test passed" below.
+</div>
+<script>
+ window.onload = function() {
+ document.body.offsetTop;
+ b.style.display = "inline-block";
+
+ document.body.offsetTop;
+ a.removeChild(c);
+
+ window.resizeTo(window.outerWidth + 1, window.outerHeight + 1);
+ setTimeout(function() { x.innerHTML = "Test passed"; }, 100);
+ }
+</script>
+<div style="width: 0px;" id="x">foo<span id="a">
+ <span id="b"></span><span>bar</span><span id="c"></span>
+ </span>
+ >
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167627 => 167628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-04-21 21:44:34 UTC (rev 167627)
+++ trunk/Source/WebCore/ChangeLog        2014-04-21 21:45:35 UTC (rev 167628)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-18 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Empty RenderInline objects should not be line break objects.
+
+ https://bugs.webkit.org/show_bug.cgi?id=131861
+ <rdar://problem/15663617>
+
+ Reviewed by David Hyatt.
+
+ * rendering/line/BreakingContextInlineHeaders.h:
+ (WebCore::BreakingContext::canBreakAtThisPosition):
+ Don't break at this position if this is an empty RenderInline.
+
</ins><span class="cx"> 2014-04-21 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] support replacements for misspelled words.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (167627 => 167628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h        2014-04-21 21:44:34 UTC (rev 167627)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h        2014-04-21 21:45:35 UTC (rev 167628)
</span><span class="lines">@@ -931,6 +931,10 @@
</span><span class="cx"> if (m_width.committedWidth() && !m_width.fitsOnLine(m_currentCharacterIsSpace) && m_currWS == NOWRAP)
</span><span class="cx"> return true;
</span><span class="cx">
</span><ins>+ // Avoid breaking on empty inlines.
+ if (m_current.renderer()->isRenderInline() && isEmptyInline(toRenderInline(*m_current.renderer())))
+ return false;
+
</ins><span class="cx"> // Avoid breaking before empty inlines.
</span><span class="cx"> if (m_nextObject && m_nextObject->isRenderInline() && isEmptyInline(toRenderInline(*m_nextObject)))
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>