<!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>[167988] 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/167988">167988</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2014-04-30 01:23:00 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Wrap some specific grid code under compilation flag
https://bugs.webkit.org/show_bug.cgi?id=132341
Reviewed by Benjamin Poulain.
Some static variables in RenderBox are only used for CSS Grid Layout code. Wrap them and the related methods
under ENABLE_CSS_GRID_LAYOUT compilation flag.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::willBeDestroyed):
(WebCore::RenderBox::containingBlockLogicalWidthForContent):
(WebCore::RenderBox::containingBlockLogicalHeightForContent):
(WebCore::RenderBox::perpendicularContainingBlockLogicalHeight):
(WebCore::RenderBox::computePercentageLogicalHeight):
* rendering/RenderBox.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167987 => 167988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-30 08:16:52 UTC (rev 167987)
+++ trunk/Source/WebCore/ChangeLog 2014-04-30 08:23:00 UTC (rev 167988)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-30 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Wrap some specific grid code under compilation flag
+ https://bugs.webkit.org/show_bug.cgi?id=132341
+
+ Reviewed by Benjamin Poulain.
+
+ Some static variables in RenderBox are only used for CSS Grid Layout code. Wrap them and the related methods
+ under ENABLE_CSS_GRID_LAYOUT compilation flag.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::willBeDestroyed):
+ (WebCore::RenderBox::containingBlockLogicalWidthForContent):
+ (WebCore::RenderBox::containingBlockLogicalHeightForContent):
+ (WebCore::RenderBox::perpendicularContainingBlockLogicalHeight):
+ (WebCore::RenderBox::computePercentageLogicalHeight):
+ * rendering/RenderBox.h:
+
</ins><span class="cx"> 2014-04-29 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r167962 and r167975.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (167987 => 167988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-30 08:16:52 UTC (rev 167987)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-30 08:23:00 UTC (rev 167988)
</span><span class="lines">@@ -74,11 +74,12 @@
</span><span class="cx"> static OverrideSizeMap* gOverrideHeightMap = 0;
</span><span class="cx"> static OverrideSizeMap* gOverrideWidthMap = 0;
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> // Used by grid elements to properly size their grid items.
</span><del>-static OverrideSizeMap* gOverrideContainingBlockLogicalHeightMap = 0;
-static OverrideSizeMap* gOverrideContainingBlockLogicalWidthMap = 0;
</del><ins>+static OverrideSizeMap* gOverrideContainingBlockLogicalHeightMap = nullptr;
+static OverrideSizeMap* gOverrideContainingBlockLogicalWidthMap = nullptr;
+#endif
</ins><span class="cx">
</span><del>-
</del><span class="cx"> // Size of border belt for autoscroll. When mouse pointer in border belt,
</span><span class="cx"> // autoscroll is started.
</span><span class="cx"> static const int autoscrollBeltSize = 20;
</span><span class="lines">@@ -216,7 +217,9 @@
</span><span class="cx"> frame().eventHandler().stopAutoscrollTimer(true);
</span><span class="cx">
</span><span class="cx"> clearOverrideSize();
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> clearContainingBlockOverrideSize();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> RenderBlock::removePercentHeightDescendantIfNeeded(*this);
</span><span class="cx">
</span><span class="lines">@@ -1030,6 +1033,7 @@
</span><span class="cx"> return gOverrideHeightMap->get(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> LayoutUnit RenderBox::overrideContainingBlockContentLogicalWidth() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasOverrideContainingBlockLogicalWidth());
</span><span class="lines">@@ -1078,6 +1082,7 @@
</span><span class="cx"> if (gOverrideContainingBlockLogicalHeightMap)
</span><span class="cx"> gOverrideContainingBlockLogicalHeightMap->remove(this);
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const
</span><span class="cx"> {
</span><span class="lines">@@ -1772,8 +1777,10 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::containingBlockLogicalWidthForContent() const
</span><span class="cx"> {
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> if (hasOverrideContainingBlockLogicalWidth())
</span><span class="cx"> return overrideContainingBlockContentLogicalWidth();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> RenderBlock* cb = containingBlock();
</span><span class="cx"> return cb->availableLogicalWidth();
</span><span class="lines">@@ -1781,8 +1788,10 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::containingBlockLogicalHeightForContent(AvailableLogicalHeightType heightType) const
</span><span class="cx"> {
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> if (hasOverrideContainingBlockLogicalHeight())
</span><span class="cx"> return overrideContainingBlockContentLogicalHeight();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> RenderBlock* cb = containingBlock();
</span><span class="cx"> return cb->availableLogicalHeight(heightType);
</span><span class="lines">@@ -1819,8 +1828,10 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::perpendicularContainingBlockLogicalHeight() const
</span><span class="cx"> {
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> if (hasOverrideContainingBlockLogicalHeight())
</span><span class="cx"> return overrideContainingBlockContentLogicalHeight();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> RenderBlock* cb = containingBlock();
</span><span class="cx"> if (cb->hasOverrideHeight())
</span><span class="lines">@@ -2758,8 +2769,10 @@
</span><span class="cx">
</span><span class="cx"> if (isHorizontal != cb->isHorizontalWritingMode())
</span><span class="cx"> availableHeight = containingBlockChild->containingBlockLogicalWidthForContent();
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> else if (hasOverrideContainingBlockLogicalHeight())
</span><span class="cx"> availableHeight = overrideContainingBlockContentLogicalHeight();
</span><ins>+#endif
</ins><span class="cx"> else if (cb->isTableCell()) {
</span><span class="cx"> if (!skippedAutoHeightContainingBlock) {
</span><span class="cx"> // Table cells violate what the CSS spec says to do with heights. Basically we
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (167987 => 167988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2014-04-30 08:16:52 UTC (rev 167987)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-04-30 08:23:00 UTC (rev 167988)
</span><span class="lines">@@ -329,6 +329,7 @@
</span><span class="cx"> void clearOverrideLogicalContentHeight();
</span><span class="cx"> void clearOverrideLogicalContentWidth();
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
</ins><span class="cx"> LayoutUnit overrideContainingBlockContentLogicalWidth() const;
</span><span class="cx"> LayoutUnit overrideContainingBlockContentLogicalHeight() const;
</span><span class="cx"> bool hasOverrideContainingBlockLogicalWidth() const;
</span><span class="lines">@@ -337,6 +338,7 @@
</span><span class="cx"> void setOverrideContainingBlockContentLogicalHeight(LayoutUnit);
</span><span class="cx"> void clearContainingBlockOverrideSize();
</span><span class="cx"> void clearOverrideContainingBlockContentLogicalHeight();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>