<!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>[167727] 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/167727">167727</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2014-04-23 15:19:19 -0700 (Wed, 23 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[New Multicolumn] fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html fails
https://bugs.webkit.org/show_bug.cgi?id=132078
Reviewed by Anders Carlsson.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::skipContainingBlockForPercentHeightCalculation):
Add a parameter to test for orthogonal writing modes. If we're perpendicular,
then we should not skip the flow thread, since we resolve relative to the column width,
and that is always set.
(WebCore::RenderBox::computePercentageLogicalHeight):
Patched to pass in whether or not the box and the ancestor block are perpendicular.
* rendering/RenderBox.h:
Patched the signature of skipContainingBlockForPercentHeightCalculation</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 (167726 => 167727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-23 21:55:50 UTC (rev 167726)
+++ trunk/Source/WebCore/ChangeLog 2014-04-23 22:19:19 UTC (rev 167727)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-23 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=132078
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::skipContainingBlockForPercentHeightCalculation):
+ Add a parameter to test for orthogonal writing modes. If we're perpendicular,
+ then we should not skip the flow thread, since we resolve relative to the column width,
+ and that is always set.
+
+ (WebCore::RenderBox::computePercentageLogicalHeight):
+ Patched to pass in whether or not the box and the ancestor block are perpendicular.
+
+ * rendering/RenderBox.h:
+ Patched the signature of skipContainingBlockForPercentHeightCalculation
+
</ins><span class="cx"> 2014-04-23 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [OS X] Make checking if a font is the system font more robust
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (167726 => 167727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-23 21:55:50 UTC (rev 167726)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-23 22:19:19 UTC (rev 167727)
</span><span class="lines">@@ -2712,11 +2712,11 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderBox::skipContainingBlockForPercentHeightCalculation(const RenderBox* containingBlock) const
</del><ins>+bool RenderBox::skipContainingBlockForPercentHeightCalculation(const RenderBox* containingBlock, bool isPerpendicularWritingMode) const
</ins><span class="cx"> {
</span><span class="cx"> // Flow threads for multicol or paged overflow should be skipped. They are invisible to the DOM,
</span><span class="cx"> // and percent heights of children should be resolved against the multicol or paged container.
</span><del>- if (containingBlock->isInFlowRenderFlowThread())
</del><ins>+ if (containingBlock->isInFlowRenderFlowThread() && !isPerpendicularWritingMode)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // For quirks mode and anonymous blocks, we skip auto-height containingBlocks when computing percentages.
</span><span class="lines">@@ -2734,7 +2734,8 @@
</span><span class="cx"> RenderBlock* cb = containingBlock();
</span><span class="cx"> const RenderBox* containingBlockChild = this;
</span><span class="cx"> LayoutUnit rootMarginBorderPaddingHeight = 0;
</span><del>- while (!cb->isRenderView() && skipContainingBlockForPercentHeightCalculation(cb)) {
</del><ins>+ bool isHorizontal = isHorizontalWritingMode();
+ while (!cb->isRenderView() && skipContainingBlockForPercentHeightCalculation(cb, isHorizontal != cb->isHorizontalWritingMode())) {
</ins><span class="cx"> if (cb->isBody() || cb->isRoot())
</span><span class="cx"> rootMarginBorderPaddingHeight += cb->marginBefore() + cb->marginAfter() + cb->borderAndPaddingLogicalHeight();
</span><span class="cx"> skippedAutoHeightContainingBlock = true;
</span><span class="lines">@@ -2751,7 +2752,7 @@
</span><span class="cx">
</span><span class="cx"> bool includeBorderPadding = isTable();
</span><span class="cx">
</span><del>- if (isHorizontalWritingMode() != cb->isHorizontalWritingMode())
</del><ins>+ if (isHorizontal != cb->isHorizontalWritingMode())
</ins><span class="cx"> availableHeight = containingBlockChild->containingBlockLogicalWidthForContent();
</span><span class="cx"> else if (hasOverrideContainingBlockLogicalHeight())
</span><span class="cx"> availableHeight = overrideContainingBlockContentLogicalHeight();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (167726 => 167727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2014-04-23 21:55:50 UTC (rev 167726)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-04-23 22:19:19 UTC (rev 167727)
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> // Returns true if we did a full repaint
</span><span class="cx"> bool repaintLayerRectsForImage(WrappedImagePtr image, const FillLayer* layers, bool drawingBackground);
</span><span class="cx">
</span><del>- bool skipContainingBlockForPercentHeightCalculation(const RenderBox* containingBlock) const;
</del><ins>+ bool skipContainingBlockForPercentHeightCalculation(const RenderBox* containingBlock, bool isPerpendicularWritingMode) const;
</ins><span class="cx">
</span><span class="cx"> LayoutUnit containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, RenderRegion* = 0, bool checkForPerpendicularWritingMode = true) const;
</span><span class="cx"> LayoutUnit containingBlockLogicalHeightForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const;
</span></span></pre>
</div>
</div>
</body>
</html>