<!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>[162822] 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/162822">162822</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2014-01-26 19:57:22 -0800 (Sun, 26 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[New Multicolumn] Change the axis property to be a boolean like other isInline checks
https://bugs.webkit.org/show_bug.cgi?id=127661
Reviewed by Simon Fraser.
* rendering/ColumnInfo.h:
(WebCore::ColumnInfo::ColumnInfo):
(WebCore::ColumnInfo::progressionIsInline):
(WebCore::ColumnInfo::setProgressionIsInline):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintColumnRules):
(WebCore::RenderBlock::initialBlockOffsetForPainting):
(WebCore::RenderBlock::blockDeltaForPaintingNextColumn):
(WebCore::RenderBlock::setComputedColumnCountAndWidth):
(WebCore::RenderBlock::updateColumnInfoFromStyle):
(WebCore::RenderBlock::columnRectAt):
(WebCore::RenderBlock::adjustPointToColumnContents):
(WebCore::RenderBlock::adjustRectForColumns):
(WebCore::RenderBlock::adjustForColumns):
* rendering/RenderMultiColumnFlowThread.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::columnNumberForOffset):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingColumnInfoh">trunk/Source/WebCore/rendering/ColumnInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162821 => 162822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-27 02:22:34 UTC (rev 162821)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 03:57:22 UTC (rev 162822)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-26 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] Change the axis property to be a boolean like other isInline checks
+ https://bugs.webkit.org/show_bug.cgi?id=127661
+
+ Reviewed by Simon Fraser.
+
+ * rendering/ColumnInfo.h:
+ (WebCore::ColumnInfo::ColumnInfo):
+ (WebCore::ColumnInfo::progressionIsInline):
+ (WebCore::ColumnInfo::setProgressionIsInline):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintColumnRules):
+ (WebCore::RenderBlock::initialBlockOffsetForPainting):
+ (WebCore::RenderBlock::blockDeltaForPaintingNextColumn):
+ (WebCore::RenderBlock::setComputedColumnCountAndWidth):
+ (WebCore::RenderBlock::updateColumnInfoFromStyle):
+ (WebCore::RenderBlock::columnRectAt):
+ (WebCore::RenderBlock::adjustPointToColumnContents):
+ (WebCore::RenderBlock::adjustRectForColumns):
+ (WebCore::RenderBlock::adjustForColumns):
+ * rendering/RenderMultiColumnFlowThread.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::columnNumberForOffset):
+
</ins><span class="cx"> 2014-01-26 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Make DOMStringMap a typedef of DatasetDOMStringMap
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingColumnInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ColumnInfo.h (162821 => 162822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ColumnInfo.h 2014-01-27 02:22:34 UTC (rev 162821)
+++ trunk/Source/WebCore/rendering/ColumnInfo.h 2014-01-27 03:57:22 UTC (rev 162822)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> ColumnInfo()
</span><span class="cx"> : m_desiredColumnWidth(0)
</span><span class="cx"> , m_desiredColumnCount(1)
</span><del>- , m_progressionAxis(InlineAxis)
</del><ins>+ , m_progressionIsInline(true)
</ins><span class="cx"> , m_progressionIsReversed(false)
</span><span class="cx"> , m_columnCount(1)
</span><span class="cx"> , m_columnHeight(0)
</span><span class="lines">@@ -55,11 +55,9 @@
</span><span class="cx"> unsigned desiredColumnCount() const { return m_desiredColumnCount; }
</span><span class="cx"> void setDesiredColumnCount(unsigned count) { m_desiredColumnCount = count; }
</span><span class="cx">
</span><del>- enum Axis { InlineAxis, BlockAxis };
</del><ins>+ bool progressionIsInline() const { return m_progressionIsInline; }
+ void setProgressionIsInline(bool progressionIsInline) { m_progressionIsInline = progressionIsInline; }
</ins><span class="cx">
</span><del>- Axis progressionAxis() const { return m_progressionAxis; }
- void setProgressionAxis(Axis progressionAxis) { m_progressionAxis = progressionAxis; }
-
</del><span class="cx"> bool progressionIsReversed() const { return m_progressionIsReversed; }
</span><span class="cx"> void setProgressionIsReversed(bool reversed) { m_progressionIsReversed = reversed; }
</span><span class="cx">
</span><span class="lines">@@ -105,7 +103,7 @@
</span><span class="cx"> private:
</span><span class="cx"> LayoutUnit m_desiredColumnWidth;
</span><span class="cx"> unsigned m_desiredColumnCount;
</span><del>- Axis m_progressionAxis;
</del><ins>+ bool m_progressionIsInline;
</ins><span class="cx"> bool m_progressionIsReversed;
</span><span class="cx">
</span><span class="cx"> unsigned m_columnCount;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (162821 => 162822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-01-27 02:22:34 UTC (rev 162821)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-01-27 03:57:22 UTC (rev 162822)
</span><span class="lines">@@ -2209,7 +2209,7 @@
</span><span class="cx">
</span><span class="cx"> bool antialias = shouldAntialiasLines(paintInfo.context);
</span><span class="cx">
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {
</del><ins>+ if (colInfo->progressionIsInline()) {
</ins><span class="cx"> bool leftToRight = style().isLeftToRightDirection() ^ colInfo->progressionIsReversed();
</span><span class="cx"> LayoutUnit currLogicalLeftOffset = leftToRight ? LayoutUnit() : contentLogicalWidth();
</span><span class="cx"> LayoutUnit ruleAdd = logicalLeftOffsetForContent();
</span><span class="lines">@@ -2282,7 +2282,7 @@
</span><span class="cx"> {
</span><span class="cx"> ColumnInfo* colInfo = columnInfo();
</span><span class="cx"> LayoutUnit result = 0;
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::BlockAxis && colInfo->progressionIsReversed()) {
</del><ins>+ if (!colInfo->progressionIsInline() && colInfo->progressionIsReversed()) {
</ins><span class="cx"> LayoutRect colRect = columnRectAt(colInfo, 0);
</span><span class="cx"> result = isHorizontalWritingMode() ? colRect.y() : colRect.x();
</span><span class="cx"> result -= borderAndPaddingBefore();
</span><span class="lines">@@ -2297,7 +2297,7 @@
</span><span class="cx"> ColumnInfo* colInfo = columnInfo();
</span><span class="cx"> LayoutUnit blockDelta = -colInfo->columnHeight();
</span><span class="cx"> LayoutUnit colGap = columnGap();
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::BlockAxis) {
</del><ins>+ if (!colInfo->progressionIsInline()) {
</ins><span class="cx"> if (!colInfo->progressionIsReversed())
</span><span class="cx"> blockDelta = colGap;
</span><span class="cx"> else
</span><span class="lines">@@ -3706,7 +3706,7 @@
</span><span class="cx"> }
</span><span class="cx"> info->setDesiredColumnCount(count);
</span><span class="cx"> info->setDesiredColumnWidth(width);
</span><del>- info->setProgressionAxis(style().hasInlineColumnAxis() ? ColumnInfo::InlineAxis : ColumnInfo::BlockAxis);
</del><ins>+ info->setProgressionIsInline(style().hasInlineColumnAxis());
</ins><span class="cx"> info->setProgressionIsReversed(style().columnProgression() == ReverseColumnProgression);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3719,10 +3719,10 @@
</span><span class="cx"> ColumnInfo* info = gColumnInfoMap->get(this);
</span><span class="cx">
</span><span class="cx"> bool needsLayout = false;
</span><del>- ColumnInfo::Axis oldAxis = info->progressionAxis();
- ColumnInfo::Axis newAxis = style->hasInlineColumnAxis() ? ColumnInfo::InlineAxis : ColumnInfo::BlockAxis;
- if (oldAxis != newAxis) {
- info->setProgressionAxis(newAxis);
</del><ins>+ bool oldProgressionIsInline = info->progressionIsInline();
+ bool newProgressionIsInline = style->hasInlineColumnAxis();
+ if (oldProgressionIsInline != newProgressionIsInline) {
+ info->setProgressionIsInline(newProgressionIsInline);
</ins><span class="cx"> needsLayout = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3775,7 +3775,7 @@
</span><span class="cx"> LayoutUnit colLogicalTop = borderAndPaddingBefore();
</span><span class="cx"> LayoutUnit colLogicalLeft = logicalLeftOffsetForContent();
</span><span class="cx"> LayoutUnit colGap = columnGap();
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {
</del><ins>+ if (colInfo->progressionIsInline()) {
</ins><span class="cx"> if (style().isLeftToRightDirection() ^ colInfo->progressionIsReversed())
</span><span class="cx"> colLogicalLeft += index * (colLogicalWidth + colGap);
</span><span class="cx"> else
</span><span class="lines">@@ -3811,10 +3811,10 @@
</span><span class="cx"> // Add in half the column gap to the left and right of the rect.
</span><span class="cx"> LayoutRect colRect = columnRectAt(colInfo, i);
</span><span class="cx"> flipForWritingMode(colRect);
</span><del>- if (isHorizontalWritingMode() == (colInfo->progressionAxis() == ColumnInfo::InlineAxis)) {
</del><ins>+ if (isHorizontalWritingMode() == colInfo->progressionIsInline()) {
</ins><span class="cx"> LayoutRect gapAndColumnRect(colRect.x() - halfColGap, colRect.y(), colRect.width() + colGap, colRect.height());
</span><span class="cx"> if (point.x() >= gapAndColumnRect.x() && point.x() < gapAndColumnRect.maxX()) {
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {
</del><ins>+ if (colInfo->progressionIsInline()) {
</ins><span class="cx"> // FIXME: The clamping that follows is not completely right for right-to-left
</span><span class="cx"> // content.
</span><span class="cx"> // Clamp everything above the column to its top left.
</span><span class="lines">@@ -3834,7 +3834,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We're inside the column. Translate the x and y into our column coordinate space.
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis)
</del><ins>+ if (colInfo->progressionIsInline())
</ins><span class="cx"> point.move(columnPoint.x() - colRect.x(), (!style().isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset));
</span><span class="cx"> else
</span><span class="cx"> point.move((!style().isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset) - colRect.x() + borderLeft() + paddingLeft(), 0);
</span><span class="lines">@@ -3842,11 +3842,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Move to the next position.
</span><del>- logicalOffset += colInfo->progressionAxis() == ColumnInfo::InlineAxis ? colRect.height() : colRect.width();
</del><ins>+ logicalOffset += colInfo->progressionIsInline() ? colRect.height() : colRect.width();
</ins><span class="cx"> } else {
</span><span class="cx"> LayoutRect gapAndColumnRect(colRect.x(), colRect.y() - halfColGap, colRect.width(), colRect.height() + colGap);
</span><span class="cx"> if (point.y() >= gapAndColumnRect.y() && point.y() < gapAndColumnRect.maxY()) {
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {
</del><ins>+ if (colInfo->progressionIsInline()) {
</ins><span class="cx"> // FIXME: The clamping that follows is not completely right for right-to-left
</span><span class="cx"> // content.
</span><span class="cx"> // Clamp everything above the column to its top left.
</span><span class="lines">@@ -3866,7 +3866,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We're inside the column. Translate the x and y into our column coordinate space.
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis)
</del><ins>+ if (colInfo->progressionIsInline())
</ins><span class="cx"> point.move((!style().isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset), columnPoint.y() - colRect.y());
</span><span class="cx"> else
</span><span class="cx"> point.move(0, (!style().isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset) - colRect.y() + borderTop() + paddingTop());
</span><span class="lines">@@ -3874,7 +3874,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Move to the next position.
</span><del>- logicalOffset += colInfo->progressionAxis() == ColumnInfo::InlineAxis ? colRect.width() : colRect.height();
</del><ins>+ logicalOffset += colInfo->progressionIsInline() ? colRect.width() : colRect.height();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3915,7 +3915,7 @@
</span><span class="cx"> LayoutRect colRect = columnRectAt(colInfo, startColumn);
</span><span class="cx"> LayoutRect repaintRect = r;
</span><span class="cx">
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {
</del><ins>+ if (colInfo->progressionIsInline()) {
</ins><span class="cx"> if (isHorizontal)
</span><span class="cx"> repaintRect.move(colRect.x() - logicalLeftOffset, - static_cast<int>(startColumn) * colHeight);
</span><span class="cx"> else
</span><span class="lines">@@ -3990,7 +3990,7 @@
</span><span class="cx"> // Now we're in the same coordinate space as the point. See if it is inside the rectangle.
</span><span class="cx"> if (isHorizontalWritingMode()) {
</span><span class="cx"> if (point.y() >= sliceRect.y() && point.y() < sliceRect.maxY()) {
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis)
</del><ins>+ if (colInfo->progressionIsInline())
</ins><span class="cx"> offset.expand(columnRectAt(colInfo, i).x() - logicalLeft, -logicalOffset);
</span><span class="cx"> else
</span><span class="cx"> offset.expand(0, columnRectAt(colInfo, i).y() - logicalOffset - borderAndPaddingBefore());
</span><span class="lines">@@ -3998,7 +3998,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (point.x() >= sliceRect.x() && point.x() < sliceRect.maxX()) {
</span><del>- if (colInfo->progressionAxis() == ColumnInfo::InlineAxis)
</del><ins>+ if (colInfo->progressionIsInline())
</ins><span class="cx"> offset.expand(-logicalOffset, columnRectAt(colInfo, i).y() - logicalLeft);
</span><span class="cx"> else
</span><span class="cx"> offset.expand(columnRectAt(colInfo, i).x() - logicalOffset - borderAndPaddingBefore(), 0);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (162821 => 162822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-01-27 02:22:34 UTC (rev 162821)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-01-27 03:57:22 UTC (rev 162822)
</span><span class="lines">@@ -1065,7 +1065,7 @@
</span><span class="cx"> return columnNumber;
</span><span class="cx">
</span><span class="cx"> ColumnInfo* columnInfo = view.columnInfo();
</span><del>- if (columnInfo && columnInfo->progressionAxis() == ColumnInfo::BlockAxis) {
</del><ins>+ if (columnInfo && !columnInfo->progressionIsInline()) {
</ins><span class="cx"> if (!columnInfo->progressionIsReversed())
</span><span class="cx"> columnNumber = (pagination.pageLength + pagination.gap - offset) / (pagination.pageLength + pagination.gap);
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>