<!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>[209903] 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/209903">209903</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-12-15 20:37:28 -0800 (Thu, 15 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change ::computeLogicalHeight's computedValues out argument to the return value.
https://bugs.webkit.org/show_bug.cgi?id=165789
Reviewed by Simon Fraser.
No change in functionality.
* html/shadow/SliderThumbElement.cpp:
(WebCore::RenderSliderContainer::computeLogicalHeight):
* html/shadow/mac/ImageControlsButtonElementMac.cpp:
(WebCore::RenderImageControlsButton::computeLogicalHeight):
* html/shadow/mac/ImageControlsRootElementMac.cpp:
(WebCore::RenderImageControls::computeLogicalHeight):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
(WebCore::RenderBlock::estimateRegionRangeForBoxChild):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::checkForPaginationLogicalHeightChange):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::updateLogicalHeight):
(WebCore::RenderBox::computeLogicalHeight):
(WebCore::RenderBox::computePercentageLogicalHeight):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):
(WebCore::RenderBox::availableLogicalHeightUsing):
* rendering/RenderBox.h:
(WebCore::RenderBox::ComputedMarginValues::ComputedMarginValues): Deleted.
(WebCore::RenderBox::LogicalExtentComputedValues::LogicalExtentComputedValues): Deleted.
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::mainAxisContentExtent):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::computeLogicalHeight):
* rendering/RenderFlowThread.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::computeLogicalHeight):
* rendering/RenderListBox.h:
* rendering/RenderMeter.cpp:
(WebCore::RenderMeter::computeLogicalHeight):
* rendering/RenderMeter.h:
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::computeLogicalHeight):
* rendering/RenderMultiColumnFlowThread.h:
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::computeLogicalHeight):
* rendering/RenderMultiColumnSet.h:
* rendering/RenderProgress.cpp:
(WebCore::RenderProgress::computeLogicalHeight):
* rendering/RenderProgress.h:
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::computeLogicalHeight):
* rendering/RenderTextControl.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::computeLogicalHeight):
* rendering/RenderView.h:
* rendering/svg/RenderSVGForeignObject.cpp:
(WebCore::RenderSVGForeignObject::computeLogicalHeight):
* rendering/svg/RenderSVGForeignObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementcpp">trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp">trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsRootElementMaccpp">trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.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="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMetercpp">trunk/Source/WebCore/rendering/RenderMeter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMeterh">trunk/Source/WebCore/rendering/RenderMeter.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSeth">trunk/Source/WebCore/rendering/RenderMultiColumnSet.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderProgresscpp">trunk/Source/WebCore/rendering/RenderProgress.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderProgressh">trunk/Source/WebCore/rendering/RenderProgress.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlh">trunk/Source/WebCore/rendering/RenderTextControl.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGForeignObjectcpp">trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGForeignObjecth">trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/ChangeLog 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2016-12-15 Zalan Bujtas <zalan@apple.com>
+
+ Change ::computeLogicalHeight's computedValues out argument to the return value.
+ https://bugs.webkit.org/show_bug.cgi?id=165789
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::RenderSliderContainer::computeLogicalHeight):
+ * html/shadow/mac/ImageControlsButtonElementMac.cpp:
+ (WebCore::RenderImageControlsButton::computeLogicalHeight):
+ * html/shadow/mac/ImageControlsRootElementMac.cpp:
+ (WebCore::RenderImageControls::computeLogicalHeight):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
+ (WebCore::RenderBlock::estimateRegionRangeForBoxChild):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::checkForPaginationLogicalHeightChange):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::updateLogicalHeight):
+ (WebCore::RenderBox::computeLogicalHeight):
+ (WebCore::RenderBox::computePercentageLogicalHeight):
+ (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
+ (WebCore::RenderBox::availableLogicalHeightUsing):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::ComputedMarginValues::ComputedMarginValues): Deleted.
+ (WebCore::RenderBox::LogicalExtentComputedValues::LogicalExtentComputedValues): Deleted.
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::mainAxisContentExtent):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::computeLogicalHeight):
+ * rendering/RenderFlowThread.h:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::computeLogicalHeight):
+ * rendering/RenderListBox.h:
+ * rendering/RenderMeter.cpp:
+ (WebCore::RenderMeter::computeLogicalHeight):
+ * rendering/RenderMeter.h:
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::computeLogicalHeight):
+ * rendering/RenderMultiColumnFlowThread.h:
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::computeLogicalHeight):
+ * rendering/RenderMultiColumnSet.h:
+ * rendering/RenderProgress.cpp:
+ (WebCore::RenderProgress::computeLogicalHeight):
+ * rendering/RenderProgress.h:
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::computeLogicalHeight):
+ * rendering/RenderTextControl.h:
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::computeLogicalHeight):
+ * rendering/RenderView.h:
+ * rendering/svg/RenderSVGForeignObject.cpp:
+ (WebCore::RenderSVGForeignObject::computeLogicalHeight):
+ * rendering/svg/RenderSVGForeignObject.h:
+
</ins><span class="cx"> 2016-12-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure HTML validation bubble's state is updated after layout
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ RenderBox::LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void layout() override;
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> bool isFlexibleBoxImpl() const override { return true; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(element()->shadowHost());
</span><span class="cx"> auto& input = downcast<HTMLInputElement>(*element()->shadowHost());
</span><span class="lines">@@ -146,13 +146,12 @@
</span><span class="cx"> if (zoomFactor != 1.0)
</span><span class="cx"> trackHeight *= zoomFactor;
</span><span class="cx">
</span><del>- RenderBox::computeLogicalHeight(trackHeight, logicalTop, computedValues);
- return;
</del><ins>+ return RenderBox::computeLogicalHeight(trackHeight, logicalTop);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> if (isVertical)
</span><span class="cx"> logicalHeight = RenderSlider::defaultTrackLength;
</span><del>- RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
</del><ins>+ return RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSliderContainer::layout()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateLogicalWidth() override;
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> const char* renderName() const override { return "RenderImageControlsButton"; }
</span><span class="cx"> bool requiresForcedStyleRecalcPropagation() const override { return true; }
</span><span class="lines">@@ -73,12 +73,12 @@
</span><span class="cx"> setLogicalWidth(isHorizontalWritingMode() ? frameSize.width() : frameSize.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderImageControlsButton::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderImageControlsButton::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><del>- RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
-
</del><ins>+ auto computedValues = RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
</ins><span class="cx"> IntSize frameSize = theme().imageControlsButtonSize(*this);
</span><span class="cx"> computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : frameSize.width();
</span><ins>+ return computedValues;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ImageControlsButtonElementMac::ImageControlsButtonElementMac(Document& document)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsRootElementMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateLogicalWidth() override;
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> const char* renderName() const override { return "RenderImageControls"; }
</span><span class="cx"> bool requiresForcedStyleRecalcPropagation() const override { return true; }
</span><span class="lines">@@ -69,15 +69,15 @@
</span><span class="cx"> setLogicalWidth(downcast<RenderImage>(*renderer).logicalWidth());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderImageControls::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderImageControls::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><del>- RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
-
</del><ins>+ auto computedValues = RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
</ins><span class="cx"> RenderElement* renderer = element()->shadowHost()->renderer();
</span><span class="cx"> if (!is<RenderImage>(*renderer))
</span><del>- return;
</del><ins>+ return computedValues;
</ins><span class="cx">
</span><span class="cx"> computedValues.m_extent = downcast<RenderImage>(*renderer).logicalHeight();
</span><ins>+ return computedValues;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<ImageControlsRootElement> ImageControlsRootElement::tryCreate(Document& document)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -2793,9 +2793,7 @@
</span><span class="cx"> LayoutUnit childMinPreferredLogicalWidth, childMaxPreferredLogicalWidth;
</span><span class="cx"> if (is<RenderBox>(*child) && child->isHorizontalWritingMode() != isHorizontalWritingMode()) {
</span><span class="cx"> auto& childBox = downcast<RenderBox>(*child);
</span><del>- LogicalExtentComputedValues computedValues;
- childBox.computeLogicalHeight(childBox.borderAndPaddingLogicalHeight(), 0, computedValues);
- childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = computedValues.m_extent;
</del><ins>+ childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = childBox.computeLogicalHeight(childBox.borderAndPaddingLogicalHeight(), 0).m_extent;
</ins><span class="cx"> } else {
</span><span class="cx"> childMinPreferredLogicalWidth = child->minPreferredLogicalWidth();
</span><span class="cx"> childMaxPreferredLogicalWidth = child->maxPreferredLogicalWidth();
</span><span class="lines">@@ -3639,9 +3637,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LogicalExtentComputedValues estimatedValues;
- box.computeLogicalHeight(RenderFlowThread::maxLogicalHeight(), logicalTopForChild(box), estimatedValues);
-
</del><ins>+ auto estimatedValues = box.computeLogicalHeight(RenderFlowThread::maxLogicalHeight(), logicalTopForChild(box));
</ins><span class="cx"> LayoutUnit offsetFromLogicalTopOfFirstRegion = box.offsetFromLogicalTopOfFirstPage();
</span><span class="cx"> RenderRegion* startRegion = flowThread->regionAtBlockOffset(this, offsetFromLogicalTopOfFirstRegion, true);
</span><span class="cx"> RenderRegion* endRegion = flowThread->regionAtBlockOffset(this, offsetFromLogicalTopOfFirstRegion + estimatedValues.m_extent, true);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -3933,8 +3933,7 @@
</span><span class="cx"> if (RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread()) {
</span><span class="cx"> LayoutUnit newColumnHeight;
</span><span class="cx"> if (hasDefiniteLogicalHeight() || view().frameView().pagination().mode != Pagination::Unpaginated) {
</span><del>- LogicalExtentComputedValues computedValues;
- computeLogicalHeight(LayoutUnit(), logicalTop(), computedValues);
</del><ins>+ auto computedValues = computeLogicalHeight(LayoutUnit(), logicalTop());
</ins><span class="cx"> newColumnHeight = std::max<LayoutUnit>(computedValues.m_extent - borderAndPaddingLogicalHeight() - scrollbarLogicalHeight(), 0);
</span><span class="cx"> if (flowThread->columnHeightAvailable() != newColumnHeight)
</span><span class="cx"> relayoutChildren = true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -2778,9 +2778,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderBox::updateLogicalHeight()
</span><span class="cx"> {
</span><del>- LogicalExtentComputedValues computedValues;
- computeLogicalHeight(logicalHeight(), logicalTop(), computedValues);
-
</del><ins>+ auto computedValues = computeLogicalHeight(logicalHeight(), logicalTop());
</ins><span class="cx"> setLogicalHeight(computedValues.m_extent);
</span><span class="cx"> setLogicalTop(computedValues.m_position);
</span><span class="cx"> setMarginBefore(computedValues.m_margins.m_before);
</span><span class="lines">@@ -2787,14 +2785,15 @@
</span><span class="cx"> setMarginAfter(computedValues.m_margins.m_after);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBox::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderBox::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><ins>+ LogicalExtentComputedValues computedValues;
</ins><span class="cx"> computedValues.m_extent = logicalHeight;
</span><span class="cx"> computedValues.m_position = logicalTop;
</span><span class="cx">
</span><span class="cx"> // Cell height is managed by the table and inline non-replaced elements do not support a height property.
</span><span class="cx"> if (isTableCell() || (isInline() && !isReplaced()))
</span><del>- return;
</del><ins>+ return computedValues;
</ins><span class="cx">
</span><span class="cx"> Length h;
</span><span class="cx"> if (isOutOfFlowPositioned())
</span><span class="lines">@@ -2818,7 +2817,7 @@
</span><span class="cx"> shouldFlipBeforeAfter ? computedValues.m_margins.m_after : computedValues.m_margins.m_before,
</span><span class="cx"> shouldFlipBeforeAfter ? computedValues.m_margins.m_before : computedValues.m_margins.m_after);
</span><span class="cx"> }
</span><del>- return;
</del><ins>+ return computedValues;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Account for block-flow in flexible boxes.
</span><span class="lines">@@ -2902,6 +2901,7 @@
</span><span class="cx"> computedValues.m_extent = std::max(computedValues.m_extent, visibleHeight - marginsBordersPadding);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ return computedValues;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::optional<LayoutUnit> RenderBox::computeLogicalHeightUsing(SizeType heightType, const Length& height, std::optional<LayoutUnit> intrinsicContentHeight) const
</span><span class="lines">@@ -3039,8 +3039,7 @@
</span><span class="cx"> } else if (isOutOfFlowPositionedWithSpecifiedHeight) {
</span><span class="cx"> // Don't allow this to affect the block' height() member variable, since this
</span><span class="cx"> // can get called while the block is still laying out its kids.
</span><del>- LogicalExtentComputedValues computedValues;
- cb->computeLogicalHeight(cb->logicalHeight(), 0, computedValues);
</del><ins>+ auto computedValues = cb->computeLogicalHeight(cb->logicalHeight(), 0);
</ins><span class="cx"> availableHeight = computedValues.m_extent - cb->borderAndPaddingLogicalHeight() - cb->scrollbarLogicalHeight();
</span><span class="cx"> } else if (cb->isRenderView())
</span><span class="cx"> availableHeight = view().pageOrViewLogicalHeight();
</span><span class="lines">@@ -3160,8 +3159,7 @@
</span><span class="cx"> && !(container->style().top().isAuto() || container->style().bottom().isAuto())) {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(container->isRenderBlock());
</span><span class="cx"> auto& block = downcast<RenderBlock>(*container);
</span><del>- LogicalExtentComputedValues computedValues;
- block.computeLogicalHeight(block.logicalHeight(), 0, computedValues);
</del><ins>+ auto computedValues = block.computeLogicalHeight(block.logicalHeight(), 0);
</ins><span class="cx"> LayoutUnit newContentHeight = computedValues.m_extent - block.borderAndPaddingLogicalHeight() - block.scrollbarLogicalHeight();
</span><span class="cx"> LayoutUnit newHeight = block.adjustContentBoxLogicalHeightForBoxSizing(newContentHeight);
</span><span class="cx"> return adjustContentBoxLogicalHeightForBoxSizing(valueForLength(logicalHeight, newHeight));
</span><span class="lines">@@ -3233,8 +3231,7 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=46500
</span><span class="cx"> if (is<RenderBlock>(*this) && isOutOfFlowPositioned() && style().height().isAuto() && !(style().top().isAuto() || style().bottom().isAuto())) {
</span><span class="cx"> RenderBlock& block = const_cast<RenderBlock&>(downcast<RenderBlock>(*this));
</span><del>- LogicalExtentComputedValues computedValues;
- block.computeLogicalHeight(block.logicalHeight(), 0, computedValues);
</del><ins>+ auto computedValues = block.computeLogicalHeight(block.logicalHeight(), 0);
</ins><span class="cx"> LayoutUnit newContentHeight = computedValues.m_extent - block.borderAndPaddingLogicalHeight() - block.scrollbarLogicalHeight();
</span><span class="cx"> return adjustContentBoxLogicalHeightForBoxSizing(newContentHeight);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -335,13 +335,6 @@
</span><span class="cx"> LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(std::optional<LayoutUnit> height) const;
</span><span class="cx">
</span><span class="cx"> struct ComputedMarginValues {
</span><del>- ComputedMarginValues()
- : m_before(0)
- , m_after(0)
- , m_start(0)
- , m_end(0)
- {
- }
</del><span class="cx"> LayoutUnit m_before;
</span><span class="cx"> LayoutUnit m_after;
</span><span class="cx"> LayoutUnit m_start;
</span><span class="lines">@@ -348,12 +341,6 @@
</span><span class="cx"> LayoutUnit m_end;
</span><span class="cx"> };
</span><span class="cx"> struct LogicalExtentComputedValues {
</span><del>- LogicalExtentComputedValues()
- : m_extent(0)
- , m_position(0)
- {
- }
-
</del><span class="cx"> LayoutUnit m_extent;
</span><span class="cx"> LayoutUnit m_position;
</span><span class="cx"> ComputedMarginValues m_margins;
</span><span class="lines">@@ -399,7 +386,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void updateLogicalWidth();
</span><span class="cx"> virtual void updateLogicalHeight();
</span><del>- virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const;
</del><ins>+ virtual LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const;
</ins><span class="cx">
</span><span class="cx"> RenderBoxRegionInfo* renderBoxRegionInfo(RenderRegion*, RenderBoxRegionInfoFlags = CacheRenderBoxRegionInfo) const;
</span><span class="cx"> void computeLogicalWidthInRegion(LogicalExtentComputedValues&, RenderRegion* = nullptr) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -442,12 +442,11 @@
</span><span class="cx"> LayoutUnit RenderFlexibleBox::mainAxisContentExtent(LayoutUnit contentLogicalHeight)
</span><span class="cx"> {
</span><span class="cx"> if (isColumnFlow()) {
</span><del>- LogicalExtentComputedValues computedValues;
</del><span class="cx"> LayoutUnit borderPaddingAndScrollbar = borderAndPaddingLogicalHeight() + scrollbarLogicalHeight();
</span><span class="cx"> if (contentLogicalHeight > LayoutUnit::max() - borderPaddingAndScrollbar)
</span><span class="cx"> contentLogicalHeight -= borderPaddingAndScrollbar;
</span><span class="cx"> LayoutUnit borderBoxLogicalHeight = contentLogicalHeight + borderPaddingAndScrollbar;
</span><del>- computeLogicalHeight(borderBoxLogicalHeight, logicalTop(), computedValues);
</del><ins>+ auto computedValues = computeLogicalHeight(borderBoxLogicalHeight, logicalTop());
</ins><span class="cx"> if (computedValues.m_extent == LayoutUnit::max())
</span><span class="cx"> return computedValues.m_extent;
</span><span class="cx"> return std::max(LayoutUnit::fromPixel(0), computedValues.m_extent - borderPaddingAndScrollbar);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -344,8 +344,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><ins>+ LogicalExtentComputedValues computedValues;
</ins><span class="cx"> computedValues.m_position = logicalTop;
</span><span class="cx"> computedValues.m_extent = 0;
</span><span class="cx">
</span><span class="lines">@@ -358,8 +359,9 @@
</span><span class="cx">
</span><span class="cx"> // If we reached the maximum size there's no point in going further.
</span><span class="cx"> if (computedValues.m_extent == maxFlowSize)
</span><del>- return;
</del><ins>+ return computedValues;
</ins><span class="cx"> }
</span><ins>+ return computedValues;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderFlowThread::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> const RenderRegionList& renderRegionList() const { return m_regionList; }
</span><span class="cx">
</span><span class="cx"> void updateLogicalWidth() final;
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -258,10 +258,10 @@
</span><span class="cx"> return itemHeight() * numItems() - rowSpacing;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><span class="cx"> LayoutUnit height = itemHeight() * size() - rowSpacing + verticalBorderAndPaddingExtent();
</span><del>- RenderBox::computeLogicalHeight(height, logicalTop, computedValues);
</del><ins>+ return RenderBox::computeLogicalHeight(height, logicalTop);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderListBox::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode lineDirection, LinePositionMode linePositionMode) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><span class="cx"> int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> void layout() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMetercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMeter.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMeter.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderMeter.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -58,10 +58,9 @@
</span><span class="cx"> setLogicalWidth(isHorizontalWritingMode() ? frameSize.width() : frameSize.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMeter::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderMeter::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><del>- RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
-
</del><ins>+ auto computedValues = RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
</ins><span class="cx"> LayoutRect frame = frameRect();
</span><span class="cx"> if (isHorizontalWritingMode())
</span><span class="cx"> frame.setHeight(computedValues.m_extent);
</span><span class="lines">@@ -69,6 +68,7 @@
</span><span class="cx"> frame.setWidth(computedValues.m_extent);
</span><span class="cx"> IntSize frameSize = theme().meterSizeForBounds(*this, snappedIntRect(frame));
</span><span class="cx"> computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : frameSize.width();
</span><ins>+ return computedValues;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMeter::updateFromElement()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMeterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMeter.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMeter.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderMeter.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateLogicalWidth() override;
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> const char* renderName() const override { return "RenderMeter"; }
</span><span class="cx"> bool isMeter() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -499,11 +499,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMultiColumnFlowThread::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderMultiColumnFlowThread::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><span class="cx"> // We simply remain at our intrinsic height.
</span><del>- computedValues.m_extent = logicalHeight;
- computedValues.m_position = logicalTop;
</del><ins>+ return { logicalHeight, logicalTop, ComputedMarginValues() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderMultiColumnFlowThread::initialLogicalWidth() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> void flowThreadDescendantInserted(RenderObject&) override;
</span><span class="cx"> void flowThreadRelativeWillBeRemoved(RenderObject&) override;
</span><span class="cx"> void flowThreadDescendantBoxLaidOut(RenderBox*) override;
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx"> LayoutUnit initialLogicalWidth() const override;
</span><span class="cx"> void setPageBreak(const RenderBlock*, LayoutUnit offset, LayoutUnit spaceShortage) override;
</span><span class="cx"> void updateMinimumPageHeight(const RenderBlock*, LayoutUnit offset, LayoutUnit minHeight) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -402,10 +402,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><del>- computedValues.m_extent = m_availableColumnHeight;
- computedValues.m_position = logicalTop;
</del><ins>+ return { m_availableColumnHeight, logicalTop, ComputedMarginValues() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderMultiColumnSet::calculateMaxColumnHeight() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> bool isRenderMultiColumnSet() const override { return true; }
</span><span class="cx"> void layout() override;
</span><span class="cx">
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> void paintObject(PaintInfo&, const LayoutPoint&) override { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderProgresscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderProgress.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderProgress.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderProgress.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -57,10 +57,9 @@
</span><span class="cx"> RenderBlockFlow::updateFromElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderProgress::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderProgress::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><del>- RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
-
</del><ins>+ auto computedValues = RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
</ins><span class="cx"> LayoutRect frame = frameRect();
</span><span class="cx"> if (isHorizontalWritingMode())
</span><span class="cx"> frame.setHeight(computedValues.m_extent);
</span><span class="lines">@@ -68,6 +67,7 @@
</span><span class="cx"> frame.setWidth(computedValues.m_extent);
</span><span class="cx"> IntSize frameSize = theme().progressBarRectForBounds(*this, snappedIntRect(frame)).size();
</span><span class="cx"> computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : frameSize.width();
</span><ins>+ return computedValues;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double RenderProgress::animationProgress() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderProgressh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderProgress.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderProgress.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderProgress.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> const char* renderName() const override { return "RenderProgress"; }
</span><span class="cx"> bool isProgress() const override { return true; }
</span><span class="cx"> bool requiresForcedStyleRecalcPropagation() const override { return true; }
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> void animationTimerFired();
</span><span class="cx"> void updateAnimationState();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> return ScrollbarTheme::theme().scrollbarThickness();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderTextControl::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><span class="cx"> TextControlInnerTextElement* innerText = innerTextElement();
</span><span class="cx"> ASSERT(innerText);
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> logicalHeight += scrollbarThickness();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
</del><ins>+ return RenderBox::computeLogicalHeight(logicalHeight, logicalTop);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderTextControl::hitInnerTextElement(HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;
</span><span class="cx"> virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const = 0;
</span><span class="cx">
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx"> RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -212,9 +212,9 @@
</span><span class="cx"> return resultLayer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderView::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit) const
</ins><span class="cx"> {
</span><del>- computedValues.m_extent = !shouldUsePrintingLayout() ? LayoutUnit(viewLogicalHeight()) : logicalHeight;
</del><ins>+ return { !shouldUsePrintingLayout() ? LayoutUnit(viewLogicalHeight()) : logicalHeight, LayoutUnit(), ComputedMarginValues() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderView::updateLogicalWidth()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/RenderView.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> void layout() override;
</span><span class="cx"> void updateLogicalWidth() override;
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGForeignObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -122,13 +122,12 @@
</span><span class="cx"> setWidth(static_cast<int>(roundf(m_viewport.width())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGForeignObject::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</del><ins>+RenderBox::LogicalExtentComputedValues RenderSVGForeignObject::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop) const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Investigate in size rounding issues
</span><span class="cx"> // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
</span><span class="cx"> // FIXME: Is this correct for vertical writing mode?
</span><del>- computedValues.m_extent = static_cast<int>(roundf(m_viewport.height()));
- computedValues.m_position = logicalTop;
</del><ins>+ return { static_cast<int>(roundf(m_viewport.height())), logicalTop, ComputedMarginValues() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSVGForeignObject::layout()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGForeignObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h (209902 => 209903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2016-12-16 03:35:54 UTC (rev 209902)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2016-12-16 04:37:28 UTC (rev 209903)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> const char* renderName() const override { return "RenderSVGForeignObject"; }
</span><span class="cx">
</span><span class="cx"> void updateLogicalWidth() override;
</span><del>- void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</del><ins>+ LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</ins><span class="cx">
</span><span class="cx"> const AffineTransform& localToParentTransform() const override;
</span><span class="cx"> AffineTransform localTransform() const override { return m_localTransform; }
</span></span></pre>
</div>
</div>
</body>
</html>