<!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>[183100] 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/183100">183100</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-04-22 03:31:24 -0700 (Wed, 22 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename hasOverride{Height,Width}() to hasOverrideLogicalContent{Height,Width}()
https://bugs.webkit.org/show_bug.cgi?id=143984
Reviewed by Darin Adler.
This patch is renaming these LayoutBox methods, because of their names
don't match with the getters and setters, which is confusing. Specially
now that we also have hasOverrideContainingBlockLogical{Height,Width}().
No new tests (this is just a refactoring).
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::fitBorderToLinesIfNeeded):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::updateRubyForJustifiedText):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::hasOverrideLogicalContentHeight):
(WebCore::RenderBox::hasOverrideLogicalContentWidth):
(WebCore::RenderBox::overrideLogicalContentWidth):
(WebCore::RenderBox::overrideLogicalContentHeight):
(WebCore::RenderBox::perpendicularContainingBlockLogicalHeight):
(WebCore::RenderBox::computeLogicalWidthInRegion):
(WebCore::RenderBox::computeLogicalHeight):
(WebCore::RenderBox::computePercentageLogicalHeight):
(WebCore::RenderBox::availableLogicalHeightUsing):
* rendering/RenderBox.h:
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::contentWidthForChild):
(WebCore::contentHeightForChild):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
* rendering/RenderRubyBase.cpp:
(WebCore::RenderRubyBase::adjustInlineDirectionLineBounds):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::calcRowLogicalHeight):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRubyBasecpp">trunk/Source/WebCore/rendering/RenderRubyBase.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/ChangeLog 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-04-22 Manuel Rego Casasnovas <rego@igalia.com>
+
+ Rename hasOverride{Height,Width}() to hasOverrideLogicalContent{Height,Width}()
+ https://bugs.webkit.org/show_bug.cgi?id=143984
+
+ Reviewed by Darin Adler.
+
+ This patch is renaming these LayoutBox methods, because of their names
+ don't match with the getters and setters, which is confusing. Specially
+ now that we also have hasOverrideContainingBlockLogical{Height,Width}().
+
+ No new tests (this is just a refactoring).
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::fitBorderToLinesIfNeeded):
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::updateRubyForJustifiedText):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::hasOverrideLogicalContentHeight):
+ (WebCore::RenderBox::hasOverrideLogicalContentWidth):
+ (WebCore::RenderBox::overrideLogicalContentWidth):
+ (WebCore::RenderBox::overrideLogicalContentHeight):
+ (WebCore::RenderBox::perpendicularContainingBlockLogicalHeight):
+ (WebCore::RenderBox::computeLogicalWidthInRegion):
+ (WebCore::RenderBox::computeLogicalHeight):
+ (WebCore::RenderBox::computePercentageLogicalHeight):
+ (WebCore::RenderBox::availableLogicalHeightUsing):
+ * rendering/RenderBox.h:
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::contentWidthForChild):
+ (WebCore::contentHeightForChild):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
+ * rendering/RenderRubyBase.cpp:
+ (WebCore::RenderRubyBase::adjustInlineDirectionLineBounds):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::calcRowLogicalHeight):
+
</ins><span class="cx"> 2015-04-21 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][MediaSource] Crash when SourceBuffer::provideMediaData() is called re-entrantly.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -2938,7 +2938,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::fitBorderToLinesIfNeeded()
</span><span class="cx"> {
</span><del>- if (style().borderFit() == BorderFitBorder || hasOverrideWidth())
</del><ins>+ if (style().borderFit() == BorderFitBorder || hasOverrideLogicalContentWidth())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Walk any normal flow lines to snugly fit.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -569,7 +569,7 @@
</span><span class="cx"> totalOpportunitiesInRun += opportunitiesInRun;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(!rubyRun.hasOverrideWidth());
</del><ins>+ ASSERT(!rubyRun.hasOverrideLogicalContentWidth());
</ins><span class="cx"> float newBaseWidth = rubyRun.logicalWidth() + totalExpansion + marginStartForChild(rubyRun) + marginEndForChild(rubyRun);
</span><span class="cx"> float newRubyRunWidth = rubyRun.logicalWidth() + totalExpansion;
</span><span class="cx"> rubyBase.setInitialOffset((newRubyRunWidth - newBaseWidth) / 2);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -1026,12 +1026,12 @@
</span><span class="cx"> return m_maxPreferredLogicalWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderBox::hasOverrideHeight() const
</del><ins>+bool RenderBox::hasOverrideLogicalContentHeight() const
</ins><span class="cx"> {
</span><span class="cx"> return gOverrideHeightMap && gOverrideHeightMap->contains(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderBox::hasOverrideWidth() const
</del><ins>+bool RenderBox::hasOverrideLogicalContentWidth() const
</ins><span class="cx"> {
</span><span class="cx"> return gOverrideWidthMap && gOverrideWidthMap->contains(this);
</span><span class="cx"> }
</span><span class="lines">@@ -1070,13 +1070,13 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::overrideLogicalContentWidth() const
</span><span class="cx"> {
</span><del>- ASSERT(hasOverrideWidth());
</del><ins>+ ASSERT(hasOverrideLogicalContentWidth());
</ins><span class="cx"> return gOverrideWidthMap->get(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::overrideLogicalContentHeight() const
</span><span class="cx"> {
</span><del>- ASSERT(hasOverrideHeight());
</del><ins>+ ASSERT(hasOverrideLogicalContentHeight());
</ins><span class="cx"> return gOverrideHeightMap->get(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1907,7 +1907,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RenderBlock* cb = containingBlock();
</span><del>- if (cb->hasOverrideHeight())
</del><ins>+ if (cb->hasOverrideLogicalContentHeight())
</ins><span class="cx"> return cb->overrideLogicalContentHeight();
</span><span class="cx">
</span><span class="cx"> const RenderStyle& containingBlockStyle = cb->style();
</span><span class="lines">@@ -2312,7 +2312,7 @@
</span><span class="cx"> // width. Use the width from the style context.
</span><span class="cx"> // FIXME: Account for block-flow in flexible boxes.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=46418
</span><del>- if (hasOverrideWidth() && (isRubyRun() || style().borderFit() == BorderFitLines || parent()->isFlexibleBoxIncludingDeprecated())) {
</del><ins>+ if (hasOverrideLogicalContentWidth() && (isRubyRun() || style().borderFit() == BorderFitLines || parent()->isFlexibleBoxIncludingDeprecated())) {
</ins><span class="cx"> computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddingLogicalWidth();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2712,7 +2712,7 @@
</span><span class="cx"> // grab our cached flexible height.
</span><span class="cx"> // FIXME: Account for block-flow in flexible boxes.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=46418
</span><del>- if (hasOverrideHeight() && parent()->isFlexibleBoxIncludingDeprecated())
</del><ins>+ if (hasOverrideLogicalContentHeight() && parent()->isFlexibleBoxIncludingDeprecated())
</ins><span class="cx"> h = Length(overrideLogicalContentHeight(), Fixed);
</span><span class="cx"> else if (treatAsReplaced)
</span><span class="cx"> h = Length(computeReplacedLogicalHeight(), Fixed);
</span><span class="lines">@@ -2848,7 +2848,7 @@
</span><span class="cx"> // Table cells violate what the CSS spec says to do with heights. Basically we
</span><span class="cx"> // don't care if the cell specified a height or not. We just always make ourselves
</span><span class="cx"> // be a percentage of the cell's current content height.
</span><del>- if (!cb->hasOverrideHeight()) {
</del><ins>+ if (!cb->hasOverrideLogicalContentHeight()) {
</ins><span class="cx"> // Normally we would let the cell size intrinsically, but scrolling overflow has to be
</span><span class="cx"> // treated differently, since WinIE lets scrolled overflow regions shrink as needed.
</span><span class="cx"> // While we can't get all cases right, we can at least detect when the cell has a specified
</span><span class="lines">@@ -3037,7 +3037,7 @@
</span><span class="cx"> // artificially. We're going to rely on this cell getting expanded to some new
</span><span class="cx"> // height, and then when we lay out again we'll use the calculation below.
</span><span class="cx"> if (isTableCell() && (h.isAuto() || h.isPercent())) {
</span><del>- if (hasOverrideHeight())
</del><ins>+ if (hasOverrideLogicalContentHeight())
</ins><span class="cx"> return overrideLogicalContentHeight();
</span><span class="cx"> return logicalHeight() - borderAndPaddingLogicalHeight();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -319,8 +319,8 @@
</span><span class="cx"> // include the scrollbar height/width.
</span><span class="cx"> LayoutUnit overrideLogicalContentWidth() const;
</span><span class="cx"> LayoutUnit overrideLogicalContentHeight() const;
</span><del>- bool hasOverrideHeight() const;
- bool hasOverrideWidth() const;
</del><ins>+ bool hasOverrideLogicalContentHeight() const;
+ bool hasOverrideLogicalContentWidth() const;
</ins><span class="cx"> void setOverrideLogicalContentHeight(LayoutUnit);
</span><span class="cx"> void setOverrideLogicalContentWidth(LayoutUnit);
</span><span class="cx"> void clearOverrideSize();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -151,14 +151,14 @@
</span><span class="cx">
</span><span class="cx"> static LayoutUnit contentWidthForChild(RenderBox* child)
</span><span class="cx"> {
</span><del>- if (child->hasOverrideWidth())
</del><ins>+ if (child->hasOverrideLogicalContentWidth())
</ins><span class="cx"> return child->overrideLogicalContentWidth();
</span><span class="cx"> return child->logicalWidth() - child->borderAndPaddingLogicalWidth();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static LayoutUnit contentHeightForChild(RenderBox* child)
</span><span class="cx"> {
</span><del>- if (child->hasOverrideHeight())
</del><ins>+ if (child->hasOverrideLogicalContentHeight())
</ins><span class="cx"> return child->overrideLogicalContentHeight();
</span><span class="cx"> return child->logicalHeight() - child->borderAndPaddingLogicalHeight();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -652,7 +652,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderFlexibleBox::preferredMainAxisContentExtentForChild(RenderBox& child, bool hasInfiniteLineLength)
</span><span class="cx"> {
</span><del>- bool hasOverrideSize = child.hasOverrideWidth() || child.hasOverrideHeight();
</del><ins>+ bool hasOverrideSize = child.hasOverrideLogicalContentWidth() || child.hasOverrideLogicalContentHeight();
</ins><span class="cx"> if (hasOverrideSize)
</span><span class="cx"> child.clearOverrideSize();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRubyBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRubyBase.cpp (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRubyBase.cpp 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/rendering/RenderRubyBase.cpp 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -143,13 +143,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderRubyBase::adjustInlineDirectionLineBounds(int expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const
</span><span class="cx"> {
</span><del>- if (rubyRun()->hasOverrideWidth() && firstRootBox() && !firstRootBox()->nextRootBox()) {
</del><ins>+ if (rubyRun()->hasOverrideLogicalContentWidth() && firstRootBox() && !firstRootBox()->nextRootBox()) {
</ins><span class="cx"> logicalLeft += m_initialOffset;
</span><span class="cx"> logicalWidth -= 2 * m_initialOffset;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutUnit maxPreferredLogicalWidth = rubyRun() && rubyRun()->hasOverrideWidth() ? rubyRun()->overrideLogicalContentWidth() : this->maxPreferredLogicalWidth();
</del><ins>+ LayoutUnit maxPreferredLogicalWidth = rubyRun() && rubyRun()->hasOverrideLogicalContentWidth() ? rubyRun()->overrideLogicalContentWidth() : this->maxPreferredLogicalWidth();
</ins><span class="cx"> if (maxPreferredLogicalWidth >= logicalWidth)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (183099 => 183100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2015-04-22 06:46:04 UTC (rev 183099)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2015-04-22 10:31:24 UTC (rev 183100)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> // For row spanning cells, |r| is the last row in the span.
</span><span class="cx"> unsigned cellStartRow = cell->rowIndex();
</span><span class="cx">
</span><del>- if (cell->hasOverrideHeight()) {
</del><ins>+ if (cell->hasOverrideLogicalContentHeight()) {
</ins><span class="cx"> if (!statePusher.didPush()) {
</span><span class="cx"> // Technically, we should also push state for the row, but since
</span><span class="cx"> // rows don't push a coordinate transform, that's not necessary.
</span></span></pre>
</div>
</div>
</body>
</html>