Index: Source/core/rendering/RenderBlock.cpp |
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
index 6032af9af5a0375b784178fdb93eec83740789cf..ce3c20a882e111539fe3e00add297746ab573f0e 100644 |
--- a/Source/core/rendering/RenderBlock.cpp |
+++ b/Source/core/rendering/RenderBlock.cpp |
@@ -3458,10 +3458,10 @@ void RenderBlock::adjustStartEdgeForWritingModeIncludingColumns(LayoutRect& rect |
rect.setX(expandedLogicalHeight - rect.maxX()); |
} |
-void RenderBlock::adjustForColumns(LayoutSize& offset, const LayoutPoint& point) const |
+LayoutSize RenderBlock::columnOffset(const LayoutPoint& point) const |
{ |
if (!hasColumns()) |
- return; |
+ return LayoutSize(); |
ColumnInfo* colInfo = columnInfo(); |
@@ -3482,21 +3482,19 @@ void RenderBlock::adjustForColumns(LayoutSize& offset, const LayoutPoint& point) |
if (isHorizontalWritingMode()) { |
if (point.y() >= sliceRect.y() && point.y() < sliceRect.maxY()) { |
if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) |
- offset.expand(columnRectAt(colInfo, i).x() - logicalLeft, -logicalOffset); |
- else |
- offset.expand(0, columnRectAt(colInfo, i).y() - logicalOffset - borderBefore() - paddingBefore()); |
- return; |
+ return LayoutSize(columnRectAt(colInfo, i).x() - logicalLeft, -logicalOffset); |
+ return LayoutSize(0, columnRectAt(colInfo, i).y() - logicalOffset - borderBefore() - paddingBefore()); |
} |
} else { |
if (point.x() >= sliceRect.x() && point.x() < sliceRect.maxX()) { |
if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) |
- offset.expand(-logicalOffset, columnRectAt(colInfo, i).y() - logicalLeft); |
- else |
- offset.expand(columnRectAt(colInfo, i).x() - logicalOffset - borderBefore() - paddingBefore(), 0); |
- return; |
+ return LayoutSize(-logicalOffset, columnRectAt(colInfo, i).y() - logicalLeft); |
+ return LayoutSize(columnRectAt(colInfo, i).x() - logicalOffset - borderBefore() - paddingBefore(), 0); |
} |
} |
} |
+ |
+ return LayoutSize(); |
} |
void RenderBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const |