<!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>[214604] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214604">214604</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2017-03-30 07:40:46 -0700 (Thu, 30 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Clamp the number of autorepeat tracks
https://bugs.webkit.org/show_bug.cgi?id=170120
Reviewed by Manuel Rego Casasnovas.
Source/WebCore:
As suggested by the specs we do clamp the maximum number of tracks per grid in order to
minimize potential OOM situations. However we were not considering the case of the recently
added auto repeat syntax. Abnormally huge values for the width/height on the grid container
could lead to a number of auto repeat tracks higher than the maximum.
A new API was added to Internals in order to test limits without having to create huge
grids. This new API allows clients to set an arbitrary limit to the number of tracks. The
addition of this new API forced us to add GridPosition.cpp to the project to define the
global variable we use for testing. We took the chance to move part of the implementation
from the header file to the source file.
Last but not least, several new ASSERTs were added to Grid.cpp implementation to ensure that
we do not surpass the grid track limits.
Test: fast/css-grid-layout/grid-auto-repeat-huge-grid.html
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeGridTrackRepeatFunction):
* rendering/Grid.cpp:
(WebCore::Grid::ensureGridSize): Added ASSERT.
(WebCore::Grid::setSmallestTracksStart): Ditto.
(WebCore::Grid::setAutoRepeatTracks): Ditto.
(WebCore::Grid::setAutoRepeatEmptyColumns): Ditto.
(WebCore::Grid::setAutoRepeatEmptyRows): Ditto.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::clampAutoRepeatTracks): New method.
(WebCore::RenderGrid::placeItemsOnGrid): Clamp the number of auto repeat tracks before
passing them to the Grid.
* rendering/RenderGrid.h:
* rendering/style/GridArea.h:
(WebCore::GridSpan::GridSpan):
* rendering/style/GridPosition.cpp: Added.
(WebCore::GridPosition::setExplicitPosition):
(WebCore::GridPosition::setAutoPosition):
(WebCore::GridPosition::setSpanPosition):
(WebCore::GridPosition::setNamedGridArea):
(WebCore::GridPosition::integerPosition):
(WebCore::GridPosition::namedGridLine):
(WebCore::GridPosition::spanPosition):
(WebCore::GridPosition::operator==):
* rendering/style/GridPosition.h:
(WebCore::GridPosition::shouldBeResolvedAgainstOppositePosition):
(WebCore::GridPosition::max):
(WebCore::GridPosition::min):
(WebCore::GridPosition::setMaxPositionForTesting):
(WebCore::GridPosition::setExplicitPosition): Deleted.
(WebCore::GridPosition::setAutoPosition): Deleted.
(WebCore::GridPosition::setSpanPosition): Deleted.
(WebCore::GridPosition::setNamedGridArea): Deleted.
(WebCore::GridPosition::integerPosition): Deleted.
(WebCore::GridPosition::namedGridLine): Deleted.
(WebCore::GridPosition::spanPosition): Deleted.
(WebCore::GridPosition::operator==): Deleted.
* rendering/style/GridPositionsResolver.cpp:
(WebCore::GridPositionsResolver::explicitGridColumnCount):
(WebCore::GridPositionsResolver::explicitGridRowCount):
* testing/Internals.cpp:
(WebCore::Internals::setGridMaxTracksLimit):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
Added a new test to check the clamping of grid tracks. It's mostly all JavaScript in order
to allow us to run several test cases over a small number of grids in a single file quite
fast. The other option was to statically (CSS) create several huge grids, something that
could potentially be very expensive in terms of memory and CPU leading to timeouts.
* fast/css-grid-layout/grid-auto-repeat-huge-grid-expected.txt: Added.
* fast/css-grid-layout/grid-auto-repeat-huge-grid.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingGridcpp">trunk/Source/WebCore/rendering/Grid.cpp</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>
<li><a href="#trunkSourceWebCorerenderingstyleGridAreah">trunk/Source/WebCore/rendering/style/GridArea.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridPositionh">trunk/Source/WebCore/rendering/style/GridPosition.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridPositionsResolvercpp">trunk/Source/WebCore/rendering/style/GridPositionsResolver.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautorepeathugegridexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautorepeathugegridhtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid.html</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridPositioncpp">trunk/Source/WebCore/rendering/style/GridPosition.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/LayoutTests/ChangeLog 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-27 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Clamp the number of autorepeat tracks
+ https://bugs.webkit.org/show_bug.cgi?id=170120
+
+ Reviewed by Manuel Rego Casasnovas.
+
+ Added a new test to check the clamping of grid tracks. It's mostly all JavaScript in order
+ to allow us to run several test cases over a small number of grids in a single file quite
+ fast. The other option was to statically (CSS) create several huge grids, something that
+ could potentially be very expensive in terms of memory and CPU leading to timeouts.
+
+ * fast/css-grid-layout/grid-auto-repeat-huge-grid-expected.txt: Added.
+ * fast/css-grid-layout/grid-auto-repeat-huge-grid.html: Added.
+
</ins><span class="cx"> 2017-03-30 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [mac-wk1] LayoutTest media/modern-media-controls/airplay-button/airplay-button.html is a flaky timeout
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautorepeathugegridexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid-expected.txt (0 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid-expected.txt 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+This test checks that we properly enforce the maximum number of grid tracks in different situations.
+
+
+PASS Test that we don't get more than kGridMaxTracks repetitions even on very wide grids (normal tracks clamped).
+PASS Test that we don't get more than kGridMaxTracks repetitions even on very tall grids (normal tracks clamped).
+PASS Test that we don't get more than kGridMaxTracks repetitions even on very wide grids (auto repeat tracks clamped).
+PASS Test that we don't get more than kGridMaxTracks repetitions even on very tall grids (auto repeat tracks clamped).
+PASS Test that we don't get more than kGridMaxTracks repetitions even on very wide grids with gaps.
+PASS Test that we don't get more than kGridMaxTracks repetitions even on very tall grids with gaps.
+PASS Test that we don't get more than kGridMaxTracks repetitions even on very wide grids with gaps and min-width.
+PASS Test that we don't get more than kGridMaxTracks repetitions even on very tall grids with gaps and min-height.
+PASS Test that we don't crash when there are exactly kGridMaxTracks auto repeat rows on very tall grids.
+PASS Test that we don't crash when there are exactly kGridMaxTracks auto repeat columns on very wide grids.
+PASS Test that we don't crash when there are exactly kGridMaxTracks (normal and auto-repeat) rows on very tall grids.
+PASS Test that we don't crash when there are exactly kGridMaxTracks (normal and auto-repeat) columns on very wide grids.
+PASS Test that we don't crash when there are exactly kGridMaxTracks non auto-repeat rows on very tall grids.
+PASS Test that we don't crash when there are exactly kGridMaxTracks non auto-repeat columns on very wide grids.
+PASS Test that we don't crash when there are exactly kGridMaxTracks non auto-repeat rows on very tall grids with enough room for auto repetitions.
+PASS Test that we don't crash when there are exactly kGridMaxTracks non auto-repeat columns on very wide grids with enough room for auto repetitions.
+PASS Test that we don't crash when there are more than kGridMaxTracks non auto-repeat rows on very tall grids.
+PASS Test that we don't crash when there are more than kGridMaxTracks non auto-repeat columns on very wide grids.
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+LF
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfastcssgridlayoutgridautorepeathugegridhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid.html (0 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid.html 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -0,0 +1,333 @@
</span><ins>+<!DOCTYPE html>
+<title>Test for auto-fit and auto-fill with huge grids (lots of tracks)</title>
+<meta name="author" title="Sergio Villar Senin" href="mailto:svillar@igalia.com">
+<link href="resources/grid.css" rel="stylesheet">
+<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
+<link href="../css-intrinsic-dimensions/resources/height-keyword-classes.css" rel="stylesheet">
+
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="resources/grid-definitions-parsing-utils.js"></script>
+<style>
+ .wideGrid { width: 1000000000px; }
+ .tallGrid { height: 1000000000px; }
+
+ .width25k { width: 25000px; }
+ .height25k { height: 25000px; }
+
+ .lastColumn { grid-column: -2 / -1; }
+ .lastRow { grid-row: -2 / -1; }
+
+ .minSizeWideGrid { min-width: 1000000000px; }
+ .minSizeTallGrid { min-height: 1000000000px; }
+
+ .lotsOfFixedRepeatWithAutoFitCols { grid-template-columns: repeat(auto-fit, 10px 2px 8px) repeat(992, 1px); }
+ .lotsOfFixedRepeatWithAutoFillCols { grid-template-columns: repeat(auto-fill, 10px 2px 8px 7px 20px) repeat(995, 1px); }
+
+ .lotsOfAutoRepeatWithAutoFitCols { grid-template-columns: repeat(auto-fit, 10px 2px 8px) repeat(10, 1px); }
+ .lotsOfAutoRepeatWithAutoFillCols { grid-template-columns: repeat(auto-fill, 10px 2px 8px 7px 20px) repeat(10, 1px); }
+
+ .lotsOfFixedRepeatWithAutoFitColsReversed { grid-template-columns: repeat(992, 1px) repeat(auto-fit, 10px 2px 8px); }
+ .lotsOfFixedRepeatWithAutoFillColsReversed { grid-template-columns: repeat(995, 1px) repeat(auto-fill, 10px 2px 8px 7px 20px); }
+
+ .lotsOfFixedRepeatWithAutoFitRows { grid-template-rows: repeat(auto-fit, 10px 2px 8px) repeat(992, 1px); }
+ .lotsOfFixedRepeatWithAutoFillRows { grid-template-rows: repeat(auto-fill, 10px 2px 8px 7px 20px) repeat(995, 1px); }
+
+ .lotsOfAutoRepeatWithAutoFitRows { grid-template-rows: repeat(auto-fit, 10px 2px 8px) repeat(10, 1px); }
+ .lotsOfAutoRepeatWithAutoFillRows { grid-template-rows: repeat(auto-fill, 10px 2px 8px 7px 20px) repeat(10, 1px); }
+
+ .lotsOfFixedRepeatWithAutoFitRowsReversed { grid-template-rows: repeat(992, 1px) repeat(auto-fit, 10px 2px 8px); }
+ .lotsOfFixedRepeatWithAutoFillRowsReversed { grid-template-rows: repeat(995, 1px) repeat(auto-fill, 10px 2px 8px 7px 20px); }
+
+ .autoFitRows25px { grid-template-rows: repeat(auto-fit, 10px 2px 8px 5px); }
+ .autoFitCols25px { grid-template-columns: repeat(auto-fit, 10px 2px 8px 5px); }
+
+ .autoFillRows25px { grid-template-rows: repeat(auto-fill, 17px 8px); }
+ .autoFillCols25px { grid-template-columns: repeat(auto-fill, 2px 23px); }
+
+ .autoFitRows205pxFixed5px { grid-template-rows: repeat(900, 5px) repeat(auto-fit, 20px 50px 13px 50px 72px); }
+ .autoFitCols205pxFixed5px { grid-template-columns: repeat(900, 5px) repeat(auto-fit, 20px 50px 13px 50px 72px); }
+
+ .autoFillRows205pxFixed5px { grid-template-rows: repeat(900, 5px) repeat(auto-fill, 200px 5px); }
+ .autoFillCols205pxFixed5px { grid-template-columns: repeat(900, 5px) repeat(auto-fill, 200px 5px); }
+
+ .autoFitAndAThousandFixedRows { grid-template-rows: repeat(auto-fit, 20px 50px 72px) repeat(1000, 37px); }
+ .autoFitAndAThousandFixedCols { grid-template-columns: repeat(auto-fit, 20px 50px 72px) repeat(1000, 37px); }
+
+ .autoFillAndAThousandFixedRows { grid-template-rows: repeat(auto-fill, 2px) repeat(1000, 37px); }
+ .autoFillAndAThousandFixedCols { grid-template-columns: repeat(auto-fill, 2px) repeat(1000, 37px); }
+
+ .autoFitAndMoreThanThousandFixedRows { grid-template-rows: repeat(700, 7px) repeat(auto-fit, 11px 13px 125px) repeat(600, 6px); }
+ .autoFitAndMoreThanThousandFixedCols { grid-template-columns: repeat(700, 7px) repeat(auto-fit, 11px 13px 125px) repeat(600, 6px); }
+
+ .autoFillAndMoreThanThousandFixedRows { grid-template-rows: repeat(700, 7px) repeat(auto-fill, 20px 50px 72px) repeat(600, 6px); }
+ .autoFillAndMoreThanThousandFixedCols { grid-template-columns: repeat(700, 7px) repeat(auto-fill, 20px 50px 72px) repeat(600, 6px); }
+</style>
+
+<p>This test checks that we properly enforce the maximum number of grid tracks in different situations.</p>
+
+<div id="autoFillGridCols" class="grid"></div>
+<div id="autoFitGridCols" class="grid">
+ <div style="grid-column: 1;"></div>
+ <div style="grid-column: 2;"></div>
+ <div class="lastColumn"></div>
+</div>
+
+<div id="autoFillGridRows" class="grid"></div>
+<div id="autoFitGridRows" class="grid">
+ <div style="grid-row: 1;"></div>
+ <div style="grid-row: 2;"></div>
+ <div class="lastRow"></div>
+</div>
+
+<script>
+var maxTracksForTesting = 1000; // Keep this value in sync with the ones used in CSS definitions.
+var autoFillGridElementCols = document.getElementById("autoFillGridCols");
+var autoFitGridElementCols = document.getElementById("autoFitGridCols");
+var autoFillGridElementRows = document.getElementById("autoFillGridRows");
+var autoFitGridElementRows = document.getElementById("autoFitGridRows");
+if (window.internals)
+ window.internals.setGridMaxTracksLimit(maxTracksForTesting);
+
+function getTracksCheckingLength(gridElement, property, length, classNames) {
+ for (let className of classNames)
+ gridElement.classList.add(className);
+
+ var propertyValue = getComputedStyle(gridElement, '').getPropertyValue(property);
+ for (let className of classNames)
+ gridElement.classList.remove(className);
+
+ if (propertyValue == "") {
+ assert_equals(length, 0);
+ return [];
+ }
+
+ var tracks = propertyValue.split(' ');
+ assert_equals(tracks.length, length);
+ return tracks;
+}
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["wideGrid", "lotsOfFixedRepeatWithAutoFillCols"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["wideGrid", "lotsOfFixedRepeatWithAutoFitCols"]);
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "10px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 2], "0px");
+ assert_equals(autoFitGrid[0], "10px");
+ assert_equals(autoFitGrid[1], "2px");
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFillGrid[maxTracksForTesting - 2], "7px");
+ assert_equals(autoFillGrid[0], "10px");
+ assert_equals(autoFillGrid[1], "2px");
+}, "Test that we don't get more than kGridMaxTracks repetitions even on very wide grids (normal tracks clamped).");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["tallGrid", "lotsOfFixedRepeatWithAutoFillRows"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["tallGrid", "lotsOfFixedRepeatWithAutoFitRows"]);
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "10px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 2], "0px");
+ assert_equals(autoFitGrid[0], "10px");
+ assert_equals(autoFitGrid[1], "2px");
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFillGrid[maxTracksForTesting - 2], "7px");
+ assert_equals(autoFillGrid[0], "10px");
+ assert_equals(autoFillGrid[1], "2px");
+}, "Test that we don't get more than kGridMaxTracks repetitions even on very tall grids (normal tracks clamped).");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["wideGrid", "lotsOfFixedRepeatWithAutoFillColsReversed"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["wideGrid", "lotsOfFixedRepeatWithAutoFitColsReversed"]);
+
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "2px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 2], "0px");
+ assert_equals(autoFitGrid[0], "1px");
+ assert_equals(autoFitGrid[1], "1px");
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFillGrid[maxTracksForTesting - 2], "7px");
+ assert_equals(autoFillGrid[0], "1px");
+ assert_equals(autoFillGrid[1], "1px");
+}, "Test that we don't get more than kGridMaxTracks repetitions even on very wide grids (auto repeat tracks clamped).");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["tallGrid", "lotsOfFixedRepeatWithAutoFillRowsReversed"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["tallGrid", "lotsOfFixedRepeatWithAutoFitRowsReversed"]);
+
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "2px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 2], "0px");
+ assert_equals(autoFitGrid[0], "1px");
+ assert_equals(autoFitGrid[1], "1px");
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFillGrid[maxTracksForTesting - 2], "7px");
+ assert_equals(autoFillGrid[0], "1px");
+ assert_equals(autoFillGrid[1], "1px");
+}, "Test that we don't get more than kGridMaxTracks repetitions even on very tall grids (auto repeat tracks clamped).");
+
+test(function() {
+ autoFillGridElementCols.style.gridGap = "100px";
+ autoFitGridElementCols.style.gridGap = "100px";
+
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["wideGrid", "lotsOfAutoRepeatWithAutoFillCols"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["wideGrid", "lotsOfAutoRepeatWithAutoFitCols"]);
+
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "10px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 2], "0px");
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFillGrid[maxTracksForTesting - 2], "7px");
+
+ autoFillGridElementCols.style.gridGap = "1000000px";
+ autoFitGridElementCols.style.gridGap = "1000000px";
+
+ getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", 130, ["wideGrid", "lotsOfAutoRepeatWithAutoFillCols"]);
+ getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", 82, ["wideGrid", "lotsOfAutoRepeatWithAutoFitCols"]);
+
+ autoFillGridElementCols.style.gridGap = "0px";
+ autoFitGridElementCols.style.gridGap = "0px";
+}, "Test that we don't get more than kGridMaxTracks repetitions even on very wide grids with gaps.");
+
+test(function() {
+ autoFillGridElementRows.style.gridGap = "100px";
+ autoFitGridElementRows.style.gridGap = "100px";
+
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["tallGrid", "lotsOfAutoRepeatWithAutoFillRows"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["tallGrid", "lotsOfAutoRepeatWithAutoFitRows"]);
+
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "10px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 2], "0px");
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFillGrid[maxTracksForTesting - 2], "7px");
+
+ autoFillGridElementRows.style.gridGap = "1000000px";
+ autoFitGridElementRows.style.gridGap = "1000000px";
+
+ getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", 130, ["tallGrid", "lotsOfAutoRepeatWithAutoFillRows"]);
+ getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", 82, ["tallGrid", "lotsOfAutoRepeatWithAutoFitRows"]);
+
+ autoFillGridElementRows.style.gridGap = "0px";
+ autoFitGridElementRows.style.gridGap = "0px";
+}, "Test that we don't get more than kGridMaxTracks repetitions even on very tall grids with gaps.");
+
+test(function() {
+ var autoFillCols = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["lotsOfAutoRepeatWithAutoFillCols", "minSizeWideGrid", "min-content"]);
+ var autoFitCols = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["lotsOfAutoRepeatWithAutoFitCols", "minSizeWideGrid", "min-content"]);
+
+ // Check that clamping auto repetitions does not reduce the amount of the other tracks.
+ assert_equals(autoFillCols[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFillCols[maxTracksForTesting - 2], "7px");
+ assert_equals(autoFitCols[maxTracksForTesting - 1], "10px");
+ assert_equals(autoFitCols[maxTracksForTesting - 2], "0px");
+}, "Test that we don't get more than kGridMaxTracks repetitions even on very wide grids with gaps and min-width.");
+
+test(function() {
+ var autoFillRows = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["lotsOfAutoRepeatWithAutoFillRows", "minSizeTallGrid", "min-content"]);
+ var autoFitRows = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["lotsOfAutoRepeatWithAutoFitRows", "minSizeTallGrid", "min-content"]);
+
+ assert_equals(autoFillRows[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFillRows[maxTracksForTesting - 2], "7px");
+ assert_equals(autoFitRows[maxTracksForTesting - 1], "10px");
+ assert_equals(autoFitRows[maxTracksForTesting - 2], "0px");
+}, "Test that we don't get more than kGridMaxTracks repetitions even on very tall grids with gaps and min-height.");
+
+test(function() {
+ var autoFillRows = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["height25k", "autoFillRows25px"]);
+ var autoFitRows = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["height25k", "autoFitRows25px"]);
+
+ assert_equals(autoFillRows[maxTracksForTesting - 1], "8px");
+ assert_equals(autoFillRows[maxTracksForTesting - 2], "17px");
+ assert_equals(autoFitRows[maxTracksForTesting - 1], "5px");
+ assert_equals(autoFitRows[maxTracksForTesting - 2], "0px");
+}, "Test that we don't crash when there are exactly kGridMaxTracks auto repeat rows on very tall grids.");
+
+test(function() {
+ var autoFillCols = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["width25k", "autoFillCols25px"]);
+ var autoFitCols = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["width25k", "autoFitCols25px"]);
+
+ assert_equals(autoFillCols[maxTracksForTesting - 1], "23px");
+ assert_equals(autoFillCols[maxTracksForTesting - 2], "2px");
+ assert_equals(autoFitCols[maxTracksForTesting - 1], "5px");
+ assert_equals(autoFitCols[maxTracksForTesting - 2], "0px");
+}, "Test that we don't crash when there are exactly kGridMaxTracks auto repeat columns on very wide grids.");
+
+test(function() {
+ var autoFillRows = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["height25k", "autoFillRows205pxFixed5px"]);
+ var autoFitRows = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["height25k", "autoFitRows205pxFixed5px"]);
+
+ assert_equals(autoFillRows[maxTracksForTesting - 1], "5px");
+ assert_equals(autoFillRows[maxTracksForTesting - 2], "200px");
+ assert_equals(autoFitRows[maxTracksForTesting - 1], "72px");
+ assert_equals(autoFitRows[maxTracksForTesting - 2], "0px");
+}, "Test that we don't crash when there are exactly kGridMaxTracks (normal and auto-repeat) rows on very tall grids.");
+
+test(function() {
+ var autoFillCols = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["width25k", "autoFillCols205pxFixed5px"]);
+ var autoFitCols = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["width25k", "autoFitCols205pxFixed5px"]);
+
+ assert_equals(autoFillCols[maxTracksForTesting - 1], "5px");
+ assert_equals(autoFillCols[maxTracksForTesting - 2], "200px");
+ assert_equals(autoFitCols[maxTracksForTesting - 1], "72px");
+ assert_equals(autoFitCols[maxTracksForTesting - 2], "0px");
+}, "Test that we don't crash when there are exactly kGridMaxTracks (normal and auto-repeat) columns on very wide grids.");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["height25k", "autoFillAndAThousandFixedRows"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["height25k", "autoFitAndAThousandFixedRows"]);
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "37px");
+ assert_equals(autoFillGrid[0], "2px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "37px");
+ assert_equals(autoFitGrid[0], "20px");
+}, "Test that we don't crash when there are exactly kGridMaxTracks non auto-repeat rows on very tall grids.");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["width25k", "autoFillAndAThousandFixedCols"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["width25k", "autoFitAndAThousandFixedCols"]);
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "37px");
+ assert_equals(autoFillGrid[0], "2px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "37px");
+ assert_equals(autoFitGrid[0], "20px");
+}, "Test that we don't crash when there are exactly kGridMaxTracks non auto-repeat columns on very wide grids.");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["tallGrid", "autoFillAndAThousandFixedRows"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["tallGrid", "autoFitAndAThousandFixedRows"]);
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "2px");
+ assert_equals(autoFillGrid[0], "2px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFitGrid[0], "20px");
+}, "Test that we don't crash when there are exactly kGridMaxTracks non auto-repeat rows on very tall grids with enough room for auto repetitions.");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["wideGrid", "autoFillAndAThousandFixedCols"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["wideGrid", "autoFitAndAThousandFixedCols"]);
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "2px");
+ assert_equals(autoFillGrid[0], "2px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "20px");
+ assert_equals(autoFitGrid[0], "20px");
+}, "Test that we don't crash when there are exactly kGridMaxTracks non auto-repeat columns on very wide grids with enough room for auto repetitions.");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementRows, "grid-template-rows", maxTracksForTesting, ["height25k", "autoFillAndMoreThanThousandFixedRows"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementRows, "grid-template-rows", maxTracksForTesting, ["height25k", "autoFitAndMoreThanThousandFixedRows"]);
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "72px");
+ assert_equals(autoFillGrid[0], "7px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "125px");
+ assert_equals(autoFitGrid[0], "7px");
+}, "Test that we don't crash when there are more than kGridMaxTracks non auto-repeat rows on very tall grids.");
+
+test(function() {
+ var autoFillGrid = getTracksCheckingLength(autoFillGridElementCols, "grid-template-columns", maxTracksForTesting, ["width25k", "autoFillAndMoreThanThousandFixedCols"]);
+ var autoFitGrid = getTracksCheckingLength(autoFitGridElementCols, "grid-template-columns", maxTracksForTesting, ["width25k", "autoFitAndMoreThanThousandFixedCols"]);
+
+ assert_equals(autoFillGrid[maxTracksForTesting - 1], "72px");
+ assert_equals(autoFillGrid[0], "7px");
+ assert_equals(autoFitGrid[maxTracksForTesting - 1], "125px");
+ assert_equals(autoFitGrid[0], "7px");
+}, "Test that we don't crash when there are more than kGridMaxTracks non auto-repeat columns on very wide grids.");
+
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-huge-grid.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+LF
</ins><span class="cx">\ No newline at end of property
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+text/html
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -2624,6 +2624,7 @@
</span><span class="cx"> rendering/style/ContentData.cpp
</span><span class="cx"> rendering/style/CounterDirectives.cpp
</span><span class="cx"> rendering/style/FillLayer.cpp
</span><ins>+ rendering/style/GridPosition.cpp
</ins><span class="cx"> rendering/style/GridPositionsResolver.cpp
</span><span class="cx"> rendering/style/KeyframeList.cpp
</span><span class="cx"> rendering/style/NinePieceImage.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/ChangeLog 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+2017-03-27 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Clamp the number of autorepeat tracks
+ https://bugs.webkit.org/show_bug.cgi?id=170120
+
+ Reviewed by Manuel Rego Casasnovas.
+
+ As suggested by the specs we do clamp the maximum number of tracks per grid in order to
+ minimize potential OOM situations. However we were not considering the case of the recently
+ added auto repeat syntax. Abnormally huge values for the width/height on the grid container
+ could lead to a number of auto repeat tracks higher than the maximum.
+
+ A new API was added to Internals in order to test limits without having to create huge
+ grids. This new API allows clients to set an arbitrary limit to the number of tracks. The
+ addition of this new API forced us to add GridPosition.cpp to the project to define the
+ global variable we use for testing. We took the chance to move part of the implementation
+ from the header file to the source file.
+
+ Last but not least, several new ASSERTs were added to Grid.cpp implementation to ensure that
+ we do not surpass the grid track limits.
+
+ Test: fast/css-grid-layout/grid-auto-repeat-huge-grid.html
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeGridTrackRepeatFunction):
+ * rendering/Grid.cpp:
+ (WebCore::Grid::ensureGridSize): Added ASSERT.
+ (WebCore::Grid::setSmallestTracksStart): Ditto.
+ (WebCore::Grid::setAutoRepeatTracks): Ditto.
+ (WebCore::Grid::setAutoRepeatEmptyColumns): Ditto.
+ (WebCore::Grid::setAutoRepeatEmptyRows): Ditto.
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::clampAutoRepeatTracks): New method.
+ (WebCore::RenderGrid::placeItemsOnGrid): Clamp the number of auto repeat tracks before
+ passing them to the Grid.
+ * rendering/RenderGrid.h:
+ * rendering/style/GridArea.h:
+ (WebCore::GridSpan::GridSpan):
+ * rendering/style/GridPosition.cpp: Added.
+ (WebCore::GridPosition::setExplicitPosition):
+ (WebCore::GridPosition::setAutoPosition):
+ (WebCore::GridPosition::setSpanPosition):
+ (WebCore::GridPosition::setNamedGridArea):
+ (WebCore::GridPosition::integerPosition):
+ (WebCore::GridPosition::namedGridLine):
+ (WebCore::GridPosition::spanPosition):
+ (WebCore::GridPosition::operator==):
+ * rendering/style/GridPosition.h:
+ (WebCore::GridPosition::shouldBeResolvedAgainstOppositePosition):
+ (WebCore::GridPosition::max):
+ (WebCore::GridPosition::min):
+ (WebCore::GridPosition::setMaxPositionForTesting):
+ (WebCore::GridPosition::setExplicitPosition): Deleted.
+ (WebCore::GridPosition::setAutoPosition): Deleted.
+ (WebCore::GridPosition::setSpanPosition): Deleted.
+ (WebCore::GridPosition::setNamedGridArea): Deleted.
+ (WebCore::GridPosition::integerPosition): Deleted.
+ (WebCore::GridPosition::namedGridLine): Deleted.
+ (WebCore::GridPosition::spanPosition): Deleted.
+ (WebCore::GridPosition::operator==): Deleted.
+ * rendering/style/GridPositionsResolver.cpp:
+ (WebCore::GridPositionsResolver::explicitGridColumnCount):
+ (WebCore::GridPositionsResolver::explicitGridRowCount):
+ * testing/Internals.cpp:
+ (WebCore::Internals::setGridMaxTracksLimit):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2017-03-29 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Disconnecting a HTMLObjectElement does not always unload its content document
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -6491,6 +6491,7 @@
</span><span class="cx"> E172AF70180F289500FBADB9 /* CryptoKeyUsage.h in Headers */ = {isa = PBXBuildFile; fileRef = E172AF6F180F289500FBADB9 /* CryptoKeyUsage.h */; };
</span><span class="cx"> E172AF8F1811BC3700FBADB9 /* JSDOMPromise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E172AF8D1811BC3700FBADB9 /* JSDOMPromise.cpp */; };
</span><span class="cx"> E172AF901811BC3700FBADB9 /* JSDOMPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = E172AF8E1811BC3700FBADB9 /* JSDOMPromise.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ E175BA991E8AE3380071454F /* GridPosition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F817451E897A5200F22CD0 /* GridPosition.cpp */; };
</ins><span class="cx"> E179F0DA1B9774FE00ED0A27 /* Internals.mm in Sources */ = {isa = PBXBuildFile; fileRef = E179F0D91B9774FE00ED0A27 /* Internals.mm */; };
</span><span class="cx"> E17B491516A9B094001C8839 /* TransitionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E17B491316A9B093001C8839 /* TransitionEvent.cpp */; };
</span><span class="cx"> E17B491616A9B094001C8839 /* TransitionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = E17B491416A9B093001C8839 /* TransitionEvent.h */; };
</span><span class="lines">@@ -15072,6 +15073,7 @@
</span><span class="cx"> E1F80B8618317252007885C3 /* CryptoKeyPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyPair.h; sourceTree = "<group>"; };
</span><span class="cx"> E1F80B8B183172B5007885C3 /* JSCryptoKeyPair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoKeyPair.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E1F80B8C183172B5007885C3 /* JSCryptoKeyPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCryptoKeyPair.h; sourceTree = "<group>"; };
</span><ins>+ E1F817451E897A5200F22CD0 /* GridPosition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GridPosition.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> E1FE1368183FE1AB00892F13 /* CryptoAlgorithmRSA_OAEP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSA_OAEP.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E1FE1369183FE1AB00892F13 /* CryptoAlgorithmRSA_OAEP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRSA_OAEP.h; sourceTree = "<group>"; };
</span><span class="cx"> E1FE136E183FECF000892F13 /* CryptoAlgorithmRSA_OAEPMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSA_OAEPMac.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -23420,6 +23422,7 @@
</span><span class="cx"> BC5EB69D0E81DAEB00B25965 /* FillLayer.h */,
</span><span class="cx"> CD3E251B18046B0600E27F56 /* GridArea.h */,
</span><span class="cx"> CDEF4FD617E85C8F00AEE24B /* GridLength.h */,
</span><ins>+ E1F817451E897A5200F22CD0 /* GridPosition.cpp */,
</ins><span class="cx"> A12705C21656BD6500C2E27C /* GridPosition.h */,
</span><span class="cx"> CDF7483C18FEBCEC0006ECC0 /* GridPositionsResolver.cpp */,
</span><span class="cx"> CDF7483D18FEBCEC0006ECC0 /* GridPositionsResolver.h */,
</span><span class="lines">@@ -31070,6 +31073,7 @@
</span><span class="cx"> 0FA24D79162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp in Sources */,
</span><span class="cx"> B2A015AA0AF6CD53006BCE0E /* GraphicsTypes.cpp in Sources */,
</span><span class="cx"> E112F4711E3A861200D6CDFD /* Grid.cpp in Sources */,
</span><ins>+ E175BA991E8AE3380071454F /* GridPosition.cpp in Sources */,
</ins><span class="cx"> CDF7483E18FEBCEC0006ECC0 /* GridPositionsResolver.cpp in Sources */,
</span><span class="cx"> 316DCB4B1E7910A6001B5F87 /* JSRTCIceConnectionState.cpp in Sources */,
</span><span class="cx"> E12DE7171E4B749C00F9ACCF /* GridTrackSizingAlgorithm.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -3332,7 +3332,7 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> repetition = consumePositiveInteger(args);
</span><span class="cx"> if (!repetition)
</span><span class="cx"> return false;
</span><del>- repetitions = clampTo<size_t>(repetition->doubleValue(), 0, kGridMaxTracks);
</del><ins>+ repetitions = clampTo<size_t>(repetition->doubleValue(), 0, GridPosition::max());
</ins><span class="cx"> repeatedValues = CSSValueList::createSpaceSeparated();
</span><span class="cx"> }
</span><span class="cx"> if (!consumeCommaIncludingWhitespace(args))
</span><span class="lines">@@ -3362,7 +3362,7 @@
</span><span class="cx"> list.append(repeatedValues.releaseNonNull());
</span><span class="cx"> else {
</span><span class="cx"> // We clamp the repetitions to a multiple of the repeat() track list's size, while staying below the max grid size.
</span><del>- repetitions = std::min(repetitions, kGridMaxTracks / numberOfTracks);
</del><ins>+ repetitions = std::min(repetitions, GridPosition::max() / numberOfTracks);
</ins><span class="cx"> for (size_t i = 0; i < repetitions; ++i) {
</span><span class="cx"> for (size_t j = 0; j < repeatedValues->length(); ++j)
</span><span class="cx"> list.append(*repeatedValues->itemWithoutBoundsCheck(j));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/Grid.cpp (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/Grid.cpp 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/rendering/Grid.cpp 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx">
</span><span class="cx"> void Grid::ensureGridSize(unsigned maximumRowSize, unsigned maximumColumnSize)
</span><span class="cx"> {
</span><ins>+ ASSERT(static_cast<int>(maximumRowSize) < GridPosition::max() * 2);
+ ASSERT(static_cast<int>(maximumColumnSize) < GridPosition::max() * 2);
</ins><span class="cx"> const size_t oldColumnSize = numTracks(ForColumns);
</span><span class="cx"> const size_t oldRowSize = numTracks(ForRows);
</span><span class="cx"> if (maximumRowSize > oldRowSize) {
</span><span class="lines">@@ -74,6 +76,8 @@
</span><span class="cx">
</span><span class="cx"> void Grid::setSmallestTracksStart(int rowStart, int columnStart)
</span><span class="cx"> {
</span><ins>+ ASSERT(rowStart > GridPosition::min() && rowStart < GridPosition::max() - 1);
+ ASSERT(columnStart > GridPosition::min() && columnStart < GridPosition::max() - 1);
</ins><span class="cx"> m_smallestRowStart = rowStart;
</span><span class="cx"> m_smallestColumnStart = columnStart;
</span><span class="cx"> }
</span><span class="lines">@@ -96,6 +100,8 @@
</span><span class="cx">
</span><span class="cx"> void Grid::setAutoRepeatTracks(unsigned autoRepeatRows, unsigned autoRepeatColumns)
</span><span class="cx"> {
</span><ins>+ ASSERT(static_cast<unsigned>(GridPosition::max()) >= numTracks(ForRows) + autoRepeatRows);
+ ASSERT(static_cast<unsigned>(GridPosition::max()) >= numTracks(ForColumns) + autoRepeatColumns);
</ins><span class="cx"> m_autoRepeatRows = autoRepeatRows;
</span><span class="cx"> m_autoRepeatColumns = autoRepeatColumns;
</span><span class="cx"> }
</span><span class="lines">@@ -107,11 +113,13 @@
</span><span class="cx">
</span><span class="cx"> void Grid::setAutoRepeatEmptyColumns(std::unique_ptr<OrderedTrackIndexSet> autoRepeatEmptyColumns)
</span><span class="cx"> {
</span><ins>+ ASSERT(!autoRepeatEmptyColumns || (autoRepeatEmptyColumns->size() <= m_autoRepeatColumns));
</ins><span class="cx"> m_autoRepeatEmptyColumns = WTFMove(autoRepeatEmptyColumns);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Grid::setAutoRepeatEmptyRows(std::unique_ptr<OrderedTrackIndexSet> autoRepeatEmptyRows)
</span><span class="cx"> {
</span><ins>+ ASSERT(!autoRepeatEmptyRows || (autoRepeatEmptyRows->size() <= m_autoRepeatRows));
</ins><span class="cx"> m_autoRepeatEmptyRows = WTFMove(autoRepeatEmptyRows);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -535,10 +535,31 @@
</span><span class="cx"> return emptyTrackIndexes;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned RenderGrid::clampAutoRepeatTracks(GridTrackSizingDirection direction, unsigned autoRepeatTracks) const
+{
+ if (!autoRepeatTracks)
+ return 0;
+
+ unsigned insertionPoint = direction == ForColumns ? style().gridAutoRepeatColumnsInsertionPoint() : style().gridAutoRepeatRowsInsertionPoint();
+ unsigned maxTracks = static_cast<unsigned>(GridPosition::max());
+
+ if (!insertionPoint)
+ return std::min(autoRepeatTracks, maxTracks);
+
+ if (insertionPoint >= maxTracks)
+ return 0;
+
+ return std::min(autoRepeatTracks, maxTracks - insertionPoint);
+}
+
</ins><span class="cx"> void RenderGrid::placeItemsOnGrid(Grid& grid, SizingOperation sizingOperation) const
</span><span class="cx"> {
</span><span class="cx"> unsigned autoRepeatColumns = computeAutoRepeatTracksCount(ForColumns, sizingOperation);
</span><span class="cx"> unsigned autoRepeatRows = computeAutoRepeatTracksCount(ForRows, sizingOperation);
</span><ins>+
+ autoRepeatRows = clampAutoRepeatTracks(ForRows, autoRepeatRows);
+ autoRepeatColumns = clampAutoRepeatTracks(ForColumns, autoRepeatColumns);
+
</ins><span class="cx"> if (autoRepeatColumns != grid.autoRepeatTracks(ForColumns) || autoRepeatRows != grid.autoRepeatTracks(ForRows)) {
</span><span class="cx"> grid.setNeedsItemsPlacement(true);
</span><span class="cx"> grid.setAutoRepeatTracks(autoRepeatRows, autoRepeatColumns);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Apple Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Igalia S.L.
</del><ins>+ * Copyright (C) 2013-2017 Igalia S.L.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> // Required by GridTrackSizingAlgorithm. Keep them under control.
</span><span class="cx"> bool isOrthogonalChild(const RenderBox&) const;
</span><span class="cx"> LayoutUnit guttersSize(const Grid&, GridTrackSizingDirection, unsigned startLine, unsigned span, SizingOperation) const;
</span><del>-
</del><ins>+
</ins><span class="cx"> protected:
</span><span class="cx"> ItemPosition selfAlignmentNormalBehavior(const RenderBox* child = nullptr) const override
</span><span class="cx"> {
</span><span class="lines">@@ -86,6 +86,8 @@
</span><span class="cx">
</span><span class="cx"> unsigned computeAutoRepeatTracksCount(GridTrackSizingDirection, SizingOperation) const;
</span><span class="cx">
</span><ins>+ unsigned clampAutoRepeatTracks(GridTrackSizingDirection, unsigned autoRepeatTracks) const;
+
</ins><span class="cx"> std::unique_ptr<OrderedTrackIndexSet> computeEmptyTracksForAutoRepeat(Grid&, GridTrackSizingDirection) const;
</span><span class="cx">
</span><span class="cx"> void placeItemsOnGrid(Grid&, SizingOperation) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridArea.h (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridArea.h 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/rendering/style/GridArea.h 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014, 2016 Igalia S.L.
</del><ins>+ * Copyright (C) 2013-2017 Igalia S.L.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_startLine = std::max(-kGridMaxTracks, std::min(startLine, kGridMaxTracks - 1));
- m_endLine = std::max(-kGridMaxTracks + 1, std::min(endLine, kGridMaxTracks));
</del><ins>+ m_startLine = std::max(GridPosition::min(), std::min(startLine, GridPosition::max() - 1));
+ m_endLine = std::max(GridPosition::min() + 1, std::min(endLine, GridPosition::max()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int m_startLine;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridPositioncpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/rendering/style/GridPosition.cpp (0 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridPosition.cpp (rev 0)
+++ trunk/Source/WebCore/rendering/style/GridPosition.cpp 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -0,0 +1,106 @@
</span><ins>+/*
+ * Copyright (C) 2017 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GridPosition.h"
+
+namespace WebCore {
+
+std::optional<int> GridPosition::gMaxPositionForTesting;
+static const int kGridMaxPosition = 1000000;
+
+void GridPosition::setExplicitPosition(int position, const String& namedGridLine)
+{
+ m_type = ExplicitPosition;
+ setIntegerPosition(position);
+ m_namedGridLine = namedGridLine;
+}
+
+void GridPosition::setAutoPosition()
+{
+ m_type = AutoPosition;
+ m_integerPosition = 0;
+}
+
+// 'span' values cannot be negative, yet we reuse the <integer> position which can
+// be. This means that we have to convert the span position to an integer, losing
+// some precision here. It shouldn't be an issue in practice though.
+void GridPosition::setSpanPosition(int position, const String& namedGridLine)
+{
+ m_type = SpanPosition;
+ setIntegerPosition(position);
+ m_namedGridLine = namedGridLine;
+}
+
+void GridPosition::setNamedGridArea(const String& namedGridArea)
+{
+ m_type = NamedGridAreaPosition;
+ m_namedGridLine = namedGridArea;
+}
+
+int GridPosition::integerPosition() const
+{
+ ASSERT(type() == ExplicitPosition);
+ return m_integerPosition;
+}
+
+String GridPosition::namedGridLine() const
+{
+ ASSERT(type() == ExplicitPosition || type() == SpanPosition || type() == NamedGridAreaPosition);
+ return m_namedGridLine;
+}
+
+int GridPosition::spanPosition() const
+{
+ ASSERT(type() == SpanPosition);
+ return m_integerPosition;
+}
+
+int GridPosition::max()
+{
+ return gMaxPositionForTesting.value_or(kGridMaxPosition);
+}
+
+int GridPosition::min()
+{
+ return -max();
+}
+
+bool GridPosition::operator==(const GridPosition& other) const
+{
+ return m_type == other.m_type && m_integerPosition == other.m_integerPosition && m_namedGridLine == other.m_namedGridLine;
+}
+
+void GridPosition::setMaxPositionForTesting(unsigned maxPosition)
+{
+ gMaxPositionForTesting = static_cast<int>(maxPosition);
+}
+
+} // namespace WebCore
</ins><span class="cx">Property changes on: trunk/Source/WebCore/rendering/style/GridPosition.cpp
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+LF
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCorerenderingstyleGridPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridPosition.h (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridPosition.h 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/rendering/style/GridPosition.h 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Igalia S.L.
</del><ins>+ * Copyright (C) 2013-2017 Igalia S.L.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -35,9 +35,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// Recommended maximum size for both explicit and implicit grids.
-const int kGridMaxTracks = 1000000;
-
</del><span class="cx"> enum GridPositionType {
</span><span class="cx"> AutoPosition,
</span><span class="cx"> ExplicitPosition, // [ <integer> || <string> ]
</span><span class="lines">@@ -67,69 +64,31 @@
</span><span class="cx"> bool isSpan() const { return m_type == SpanPosition; }
</span><span class="cx"> bool isNamedGridArea() const { return m_type == NamedGridAreaPosition; }
</span><span class="cx">
</span><del>- void setExplicitPosition(int position, const String& namedGridLine)
- {
- m_type = ExplicitPosition;
- setIntegerPosition(position);
- m_namedGridLine = namedGridLine;
- }
</del><ins>+ WEBCORE_EXPORT void setExplicitPosition(int position, const String& namedGridLine);
+ void setAutoPosition();
+ WEBCORE_EXPORT void setSpanPosition(int position, const String& namedGridLine);
+ void setNamedGridArea(const String&);
</ins><span class="cx">
</span><del>- void setAutoPosition()
- {
- m_type = AutoPosition;
- m_integerPosition = 0;
- }
</del><ins>+ WEBCORE_EXPORT int integerPosition() const;
+ String namedGridLine() const;
+ WEBCORE_EXPORT int spanPosition() const;
</ins><span class="cx">
</span><del>- // 'span' values cannot be negative, yet we reuse the <integer> position which can
- // be. This means that we have to convert the span position to an integer, losing
- // some precision here. It shouldn't be an issue in practice though.
- void setSpanPosition(int position, const String& namedGridLine)
- {
- m_type = SpanPosition;
- setIntegerPosition(position);
- m_namedGridLine = namedGridLine;
- }
</del><ins>+ bool operator==(const GridPosition& other) const;
</ins><span class="cx">
</span><del>- void setNamedGridArea(const String& namedGridArea)
- {
- m_type = NamedGridAreaPosition;
- m_namedGridLine = namedGridArea;
- }
</del><ins>+ bool shouldBeResolvedAgainstOppositePosition() const { return isAuto() || isSpan(); }
</ins><span class="cx">
</span><del>- int integerPosition() const
- {
- ASSERT(type() == ExplicitPosition);
- return m_integerPosition;
- }
</del><ins>+ // Note that grid line 1 is internally represented by the index 0, that's why the max value for
+ // a position is kGridMaxTracks instead of kGridMaxTracks + 1.
+ static int max();
+ static int min();
</ins><span class="cx">
</span><del>- String namedGridLine() const
- {
- ASSERT(type() == ExplicitPosition || type() == SpanPosition || type() == NamedGridAreaPosition);
- return m_namedGridLine;
- }
</del><ins>+ WEBCORE_EXPORT static void setMaxPositionForTesting(unsigned);
</ins><span class="cx">
</span><del>- int spanPosition() const
- {
- ASSERT(type() == SpanPosition);
- return m_integerPosition;
- }
</del><ins>+private:
+ static std::optional<int> gMaxPositionForTesting;
</ins><span class="cx">
</span><del>- bool operator==(const GridPosition& other) const
- {
- return m_type == other.m_type && m_integerPosition == other.m_integerPosition && m_namedGridLine == other.m_namedGridLine;
- }
</del><ins>+ void setIntegerPosition(int integerPosition) { m_integerPosition = clampTo(integerPosition, min(), max()); }
</ins><span class="cx">
</span><del>- bool shouldBeResolvedAgainstOppositePosition() const
- {
- return isAuto() || isSpan();
- }
-
-private:
- void setIntegerPosition(int integerPosition)
- {
- m_integerPosition = clampTo(integerPosition, -kGridMaxTracks, kGridMaxTracks);
- }
-
</del><span class="cx"> GridPositionType m_type;
</span><span class="cx"> int m_integerPosition;
</span><span class="cx"> String m_namedGridLine;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridPositionsResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridPositionsResolver.cpp (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridPositionsResolver.cpp 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/rendering/style/GridPositionsResolver.cpp 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014-2016 Igalia S.L.
</del><ins>+ * Copyright (C) 2014-2017 Igalia S.L.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -187,12 +187,12 @@
</span><span class="cx">
</span><span class="cx"> unsigned GridPositionsResolver::explicitGridColumnCount(const RenderStyle& gridContainerStyle, unsigned autoRepeatTracksCount)
</span><span class="cx"> {
</span><del>- return std::min<unsigned>(std::max(gridContainerStyle.gridColumns().size() + autoRepeatTracksCount, gridContainerStyle.namedGridAreaColumnCount()), kGridMaxTracks);
</del><ins>+ return std::min<unsigned>(std::max(gridContainerStyle.gridColumns().size() + autoRepeatTracksCount, gridContainerStyle.namedGridAreaColumnCount()), GridPosition::max());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned GridPositionsResolver::explicitGridRowCount(const RenderStyle& gridContainerStyle, unsigned autoRepeatTracksCount)
</span><span class="cx"> {
</span><del>- return std::min<unsigned>(std::max(gridContainerStyle.gridRows().size() + autoRepeatTracksCount, gridContainerStyle.namedGridAreaRowCount()), kGridMaxTracks);
</del><ins>+ return std::min<unsigned>(std::max(gridContainerStyle.gridRows().size() + autoRepeatTracksCount, gridContainerStyle.namedGridAreaRowCount()), GridPosition::max());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static unsigned explicitGridSizeForSide(const RenderStyle& gridContainerStyle, GridPositionSide side, unsigned autoRepeatTracksCount)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "GCObservation.h"
</span><ins>+#include "GridPosition.h"
</ins><span class="cx"> #include "HTMLCanvasElement.h"
</span><span class="cx"> #include "HTMLIFrameElement.h"
</span><span class="cx"> #include "HTMLImageElement.h"
</span><span class="lines">@@ -770,6 +771,11 @@
</span><span class="cx"> downcast<BitmapImage>(*image).setClearDecoderAfterAsyncFrameRequestForTesting(value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::setGridMaxTracksLimit(unsigned maxTrackLimit)
+{
+ GridPosition::setMaxPositionForTesting(maxTrackLimit);
+}
+
</ins><span class="cx"> void Internals::clearPageCache()
</span><span class="cx"> {
</span><span class="cx"> PageCache::singleton().pruneToSizeNow(0, PruningReason::None);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/testing/Internals.h 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -118,6 +118,8 @@
</span><span class="cx"> bool isImageAnimating(HTMLImageElement&);
</span><span class="cx"> void setClearDecoderAfterAsyncFrameRequestForTesting(HTMLImageElement&, bool);
</span><span class="cx">
</span><ins>+ void setGridMaxTracksLimit(unsigned);
+
</ins><span class="cx"> void clearPageCache();
</span><span class="cx"> unsigned pageCacheSize() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (214603 => 214604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2017-03-30 13:11:25 UTC (rev 214603)
+++ trunk/Source/WebCore/testing/Internals.idl 2017-03-30 14:40:46 UTC (rev 214604)
</span><span class="lines">@@ -250,6 +250,8 @@
</span><span class="cx"> boolean isImageAnimating(HTMLImageElement element);
</span><span class="cx"> void setClearDecoderAfterAsyncFrameRequestForTesting(HTMLImageElement element, boolean value);
</span><span class="cx">
</span><ins>+ void setGridMaxTracksLimit(unsigned long maxTracksLimit);
+
</ins><span class="cx"> readonly attribute InternalSettings settings;
</span><span class="cx"> readonly attribute unsigned long workerThreadCount;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>