<!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>[161743] trunk/Source/WebCore</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/161743">161743</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 22:18:35 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix RenderObject.o for iOS. Unreviewed build fix.
<a href="http://trac.webkit.org/projects/webkit/changeset/156285">r156285</a> renamed firstChild() to firstChildSlow(), so update
occurances in IOS_TEXT_AUTOSIZING code. Also account for a
RenderObject::style reference / pointer change.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::traverseNext):
(WebCore::includeNonFixedHeight):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161742 => 161743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 06:08:50 UTC (rev 161742)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 06:18:35 UTC (rev 161743)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Fix RenderObject.o for iOS. Unreviewed build fix.
+
+ r156285 renamed firstChild() to firstChildSlow(), so update
+ occurances in IOS_TEXT_AUTOSIZING code. Also account for a
+ RenderObject::style reference / pointer change.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::traverseNext):
+ (WebCore::includeNonFixedHeight):
+
+2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Fix MediaPlayerPrivateMediaSourceAVFObjC.o for iOS. Unreviewed build fix.
</span><span class="cx">
</span><span class="cx"> Import CALayer, which Mac must have been getting some other way.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (161742 => 161743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-01-11 06:08:50 UTC (rev 161742)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-01-11 06:18:35 UTC (rev 161743)
</span><span class="lines">@@ -289,9 +289,10 @@
</span><span class="cx"> // Inspired by Node::traverseNextNode.
</span><span class="cx"> RenderObject* RenderObject::traverseNext(const RenderObject* stayWithin) const
</span><span class="cx"> {
</span><del>- if (firstChild()) {
- ASSERT(!stayWithin || firstChild()->isDescendantOf(stayWithin));
- return firstChild();
</del><ins>+ RenderObject* child = firstChildSlow();
+ if (child) {
+ ASSERT(!stayWithin || child->isDescendantOf(stayWithin));
+ return child;
</ins><span class="cx"> }
</span><span class="cx"> if (this == stayWithin)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -315,7 +316,7 @@
</span><span class="cx"> BlockContentHeightType overflowType;
</span><span class="cx">
</span><span class="cx"> // Check for suitable children.
</span><del>- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
</del><ins>+ for (RenderObject* child = firstChildSlow(); child; child = child->nextSibling()) {
</ins><span class="cx"> overflowType = inclusionFunction(child);
</span><span class="cx"> if (overflowType != FixedHeight) {
</span><span class="cx"> currentDepth++;
</span><span class="lines">@@ -359,7 +360,7 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* RenderObject::traverseNext(const RenderObject* stayWithin, TraverseNextInclusionFunction inclusionFunction) const
</span><span class="cx"> {
</span><del>- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
</del><ins>+ for (RenderObject* child = firstChildSlow(); child; child = child->nextSibling()) {
</ins><span class="cx"> if (inclusionFunction(child)) {
</span><span class="cx"> ASSERT(!stayWithin || child->isDescendantOf(stayWithin));
</span><span class="cx"> return child;
</span><span class="lines">@@ -398,18 +399,16 @@
</span><span class="cx">
</span><span class="cx"> static RenderObject::BlockContentHeightType includeNonFixedHeight(const RenderObject* render)
</span><span class="cx"> {
</span><del>- RenderStyle* style = render->style();
- if (style) {
- if (style->height().type() == Fixed) {
- if (render->isRenderBlock()) {
- const RenderBlock* block = toRenderBlock(render);
- // For fixed height styles, if the overflow size of the element spills out of the specified
- // height, assume we can apply text auto-sizing.
- if (style->overflowY() == OVISIBLE && style->height().value() < block->layoutOverflowRect().maxY())
- return RenderObject::OverflowHeight;
- }
- return RenderObject::FixedHeight;
</del><ins>+ const RenderStyle& style = render->style();
+ if (style.height().type() == Fixed) {
+ if (render->isRenderBlock()) {
+ const RenderBlock* block = toRenderBlock(render);
+ // For fixed height styles, if the overflow size of the element spills out of the specified
+ // height, assume we can apply text auto-sizing.
+ if (style.overflowY() == OVISIBLE && style.height().value() < block->layoutOverflowRect().maxY())
+ return RenderObject::OverflowHeight;
</ins><span class="cx"> }
</span><ins>+ return RenderObject::FixedHeight;
</ins><span class="cx"> }
</span><span class="cx"> return RenderObject::FlexibleHeight;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>