<!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>[190783] 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/190783">190783</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2015-10-09 05:47:47 -0700 (Fri, 09 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Remove unneeded calls to compute(Content)LogicalWidth(Height)
https://bugs.webkit.org/show_bug.cgi?id=149926
Reviewed by Darin Adler.
In order to resolve a Length to a LayoutUnit we need to
provide a maximum value so that i.e. percentages are correctly
computed. That maximum value was computeLogicalWidth() for
columns and computeContentLogicalHeight() for rows. We were
calling it for every single track with a definite size instead
of computing it once and reusing it multiple times.
This brings some nice performance improvements:
- 2.9% in /Layout/fixed-grid-lots-of-data
- 2.95% in /Layout/fixed-grid-lots-of-stretched-data
No new tests required as there is no change in functionality.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
(WebCore::RenderGrid::computeUsedBreadthOfMinLength):
(WebCore::RenderGrid::computeUsedBreadthOfMaxLength):
(WebCore::RenderGrid::tracksAreWiderThanMinTrackBreadth):
* rendering/RenderGrid.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridh">trunk/Source/WebCore/rendering/RenderGrid.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190782 => 190783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-09 09:07:32 UTC (rev 190782)
+++ trunk/Source/WebCore/ChangeLog 2015-10-09 12:47:47 UTC (rev 190783)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-10-08 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Remove unneeded calls to compute(Content)LogicalWidth(Height)
+ https://bugs.webkit.org/show_bug.cgi?id=149926
+
+ Reviewed by Darin Adler.
+
+ In order to resolve a Length to a LayoutUnit we need to
+ provide a maximum value so that i.e. percentages are correctly
+ computed. That maximum value was computeLogicalWidth() for
+ columns and computeContentLogicalHeight() for rows. We were
+ calling it for every single track with a definite size instead
+ of computing it once and reusing it multiple times.
+
+ This brings some nice performance improvements:
+ - 2.9% in /Layout/fixed-grid-lots-of-data
+ - 2.95% in /Layout/fixed-grid-lots-of-stretched-data
+
+ No new tests required as there is no change in functionality.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
+ (WebCore::RenderGrid::computeUsedBreadthOfMinLength):
+ (WebCore::RenderGrid::computeUsedBreadthOfMaxLength):
+ (WebCore::RenderGrid::tracksAreWiderThanMinTrackBreadth):
+ * rendering/RenderGrid.h:
+
</ins><span class="cx"> 2015-10-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, build fix for ENABLE(MEDIA_SESSION) after r190030.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (190782 => 190783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-10-09 09:07:32 UTC (rev 190782)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-10-09 12:47:47 UTC (rev 190783)
</span><span class="lines">@@ -386,6 +386,7 @@
</span><span class="cx"> Vector<unsigned> flexibleSizedTracksIndex;
</span><span class="cx"> sizingData.contentSizedTracksIndex.shrink(0);
</span><span class="cx">
</span><ins>+ const LayoutUnit maxSize = direction == ForColumns ? contentLogicalWidth() : computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt).valueOr(0);
</ins><span class="cx"> // 1. Initialize per Grid track variables.
</span><span class="cx"> for (unsigned i = 0; i < tracks.size(); ++i) {
</span><span class="cx"> GridTrack& track = tracks[i];
</span><span class="lines">@@ -393,8 +394,8 @@
</span><span class="cx"> const GridLength& minTrackBreadth = trackSize.minTrackBreadth();
</span><span class="cx"> const GridLength& maxTrackBreadth = trackSize.maxTrackBreadth();
</span><span class="cx">
</span><del>- track.setBaseSize(computeUsedBreadthOfMinLength(direction, minTrackBreadth));
- track.setGrowthLimit(computeUsedBreadthOfMaxLength(direction, maxTrackBreadth, track.baseSize()));
</del><ins>+ track.setBaseSize(computeUsedBreadthOfMinLength(minTrackBreadth, maxSize));
+ track.setGrowthLimit(computeUsedBreadthOfMaxLength(maxTrackBreadth, track.baseSize(), maxSize));
</ins><span class="cx"> track.setInfinitelyGrowable(false);
</span><span class="cx">
</span><span class="cx"> if (trackSize.isContentSized())
</span><span class="lines">@@ -470,43 +471,32 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutUnit RenderGrid::computeUsedBreadthOfMinLength(GridTrackSizingDirection direction, const GridLength& gridLength) const
</del><ins>+LayoutUnit RenderGrid::computeUsedBreadthOfMinLength(const GridLength& gridLength, LayoutUnit maxSize) const
</ins><span class="cx"> {
</span><span class="cx"> if (gridLength.isFlex())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> const Length& trackLength = gridLength.length();
</span><span class="cx"> if (trackLength.isSpecified())
</span><del>- return computeUsedBreadthOfSpecifiedLength(direction, trackLength);
</del><ins>+ return valueForLength(trackLength, maxSize);
</ins><span class="cx">
</span><span class="cx"> ASSERT(trackLength.isMinContent() || trackLength.isAuto() || trackLength.isMaxContent());
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutUnit RenderGrid::computeUsedBreadthOfMaxLength(GridTrackSizingDirection direction, const GridLength& gridLength, LayoutUnit usedBreadth) const
</del><ins>+LayoutUnit RenderGrid::computeUsedBreadthOfMaxLength(const GridLength& gridLength, LayoutUnit usedBreadth, LayoutUnit maxSize) const
</ins><span class="cx"> {
</span><span class="cx"> if (gridLength.isFlex())
</span><span class="cx"> return usedBreadth;
</span><span class="cx">
</span><span class="cx"> const Length& trackLength = gridLength.length();
</span><del>- if (trackLength.isSpecified()) {
- LayoutUnit computedBreadth = computeUsedBreadthOfSpecifiedLength(direction, trackLength);
- ASSERT(computedBreadth != infinity);
- return computedBreadth;
- }
</del><ins>+ if (trackLength.isSpecified())
+ return valueForLength(trackLength, maxSize);
</ins><span class="cx">
</span><span class="cx"> ASSERT(trackLength.isMinContent() || trackLength.isAuto() || trackLength.isMaxContent());
</span><span class="cx"> return infinity;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutUnit RenderGrid::computeUsedBreadthOfSpecifiedLength(GridTrackSizingDirection direction, const Length& trackLength) const
-{
- ASSERT(trackLength.isSpecified());
- if (direction == ForColumns)
- return valueForLength(trackLength, contentLogicalWidth());
- return valueForLength(trackLength, computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt).valueOr(0));
-}
-
</del><span class="cx"> double RenderGrid::computeFlexFactorUnitSize(const Vector<GridTrack>& tracks, GridTrackSizingDirection direction, double flexFactorSum, LayoutUnit leftOverSpace, const Vector<unsigned, 8>& flexibleTracksIndexes, std::unique_ptr<TrackIndexSet> tracksToTreatAsInflexible) const
</span><span class="cx"> {
</span><span class="cx"> // We want to avoid the effect of flex factors sum below 1 making the factor unit size to grow exponentially.
</span><span class="lines">@@ -1001,10 +991,11 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool RenderGrid::tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection direction, const Vector<GridTrack>& tracks)
</span><span class="cx"> {
</span><ins>+ const LayoutUnit maxSize = direction == ForColumns ? contentLogicalWidth() : computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt).valueOr(0);
</ins><span class="cx"> for (unsigned i = 0; i < tracks.size(); ++i) {
</span><span class="cx"> const GridTrackSize& trackSize = gridTrackSize(direction, i);
</span><span class="cx"> const GridLength& minTrackBreadth = trackSize.minTrackBreadth();
</span><del>- if (computeUsedBreadthOfMinLength(direction, minTrackBreadth) > tracks[i].baseSize())
</del><ins>+ if (computeUsedBreadthOfMinLength(minTrackBreadth, maxSize) > tracks[i].baseSize())
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (190782 => 190783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2015-10-09 09:07:32 UTC (rev 190782)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2015-10-09 12:47:47 UTC (rev 190783)
</span><span class="lines">@@ -71,9 +71,8 @@
</span><span class="cx"> class GridSizingData;
</span><span class="cx"> void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData&, LayoutUnit& availableLogicalSpace);
</span><span class="cx"> bool gridElementIsShrinkToFit();
</span><del>- LayoutUnit computeUsedBreadthOfMinLength(GridTrackSizingDirection, const GridLength&) const;
- LayoutUnit computeUsedBreadthOfMaxLength(GridTrackSizingDirection, const GridLength&, LayoutUnit usedBreadth) const;
- LayoutUnit computeUsedBreadthOfSpecifiedLength(GridTrackSizingDirection, const Length&) const;
</del><ins>+ LayoutUnit computeUsedBreadthOfMinLength(const GridLength&, LayoutUnit maxSize) const;
+ LayoutUnit computeUsedBreadthOfMaxLength(const GridLength&, LayoutUnit usedBreadth, LayoutUnit maxSize) const;
</ins><span class="cx"> void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, GridSizingData&);
</span><span class="cx">
</span><span class="cx"> void ensureGridSize(unsigned maximumRowIndex, unsigned maximumColumnIndex);
</span></span></pre>
</div>
</div>
</body>
</html>