| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index 688af1cb760806023fb06db570ad475e39898d1e..0e4d901408282f30e092d06ad6a8fde4f87ac5f0 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -1338,7 +1338,7 @@ void RenderBlock::finishDelayUpdateScrollInfo()
|
| void RenderBlock::updateScrollInfoAfterLayout()
|
| {
|
| if (hasOverflowClip()) {
|
| - if (style()->isFlippedBlocksWritingMode()) {
|
| + if (style()->slowIsFlippedBlocksWritingMode()) {
|
| // FIXME: https://bugs.webkit.org/show_bug.cgi?id=97937
|
| // Workaround for now. We cannot delay the scroll info for overflow
|
| // for items with opposite writing directions, as the contents needs
|
| @@ -2461,7 +2461,7 @@ public:
|
| ColumnRectIterator(const RenderBlock& block)
|
| : m_block(block)
|
| , m_colInfo(block.columnInfo())
|
| - , m_direction(m_block.style()->isFlippedBlocksWritingMode() ? 1 : -1)
|
| + , m_direction(m_block.style()->slowIsFlippedBlocksWritingMode() ? 1 : -1)
|
| , m_isHorizontal(block.isHorizontalWritingMode())
|
| , m_logicalLeft(block.logicalLeftOffsetForContent())
|
| {
|
| @@ -2638,7 +2638,7 @@ PositionWithAffinity RenderBlock::positionForPointWithInlineChildren(const Layou
|
| return createPositionWithAffinity(0, DOWNSTREAM);
|
|
|
| bool linesAreFlipped = style()->isFlippedLinesWritingMode();
|
| - bool blocksAreFlipped = style()->isFlippedBlocksWritingMode();
|
| + bool blocksAreFlipped = style()->slowIsFlippedBlocksWritingMode();
|
|
|
| // look for the closest line box in the root box which is at the passed-in y coordinate
|
| InlineBox* closestBox = 0;
|
| @@ -2756,7 +2756,7 @@ PositionWithAffinity RenderBlock::positionForPoint(const LayoutPoint& point)
|
| while (lastCandidateBox && !isChildHitTestCandidate(lastCandidateBox))
|
| lastCandidateBox = lastCandidateBox->previousSiblingBox();
|
|
|
| - bool blocksAreFlipped = style()->isFlippedBlocksWritingMode();
|
| + bool blocksAreFlipped = style()->slowIsFlippedBlocksWritingMode();
|
| if (lastCandidateBox) {
|
| if (pointInLogicalContents.y() > logicalTopForChild(lastCandidateBox)
|
| || (!blocksAreFlipped && pointInLogicalContents.y() == logicalTopForChild(lastCandidateBox)))
|
| @@ -2969,9 +2969,9 @@ void RenderBlock::adjustPointToColumnContents(LayoutPoint& point) const
|
|
|
| // We're inside the column. Translate the x and y into our column coordinate space.
|
| if (colInfo->progressionAxis() == ColumnInfo::InlineAxis)
|
| - point.move(columnPoint.x() - colRect.x(), (!style()->isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset));
|
| + point.move(columnPoint.x() - colRect.x(), (!style()->slowIsFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset));
|
| else
|
| - point.move((!style()->isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset) - colRect.x() + borderLeft() + paddingLeft(), 0);
|
| + point.move((!style()->slowIsFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset) - colRect.x() + borderLeft() + paddingLeft(), 0);
|
| return;
|
| }
|
|
|
| @@ -3001,9 +3001,9 @@ void RenderBlock::adjustPointToColumnContents(LayoutPoint& point) const
|
|
|
| // We're inside the column. Translate the x and y into our column coordinate space.
|
| if (colInfo->progressionAxis() == ColumnInfo::InlineAxis)
|
| - point.move((!style()->isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset), columnPoint.y() - colRect.y());
|
| + point.move((!style()->slowIsFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset), columnPoint.y() - colRect.y());
|
| else
|
| - point.move(0, (!style()->isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset) - colRect.y() + borderTop() + paddingTop());
|
| + point.move(0, (!style()->slowIsFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset) - colRect.y() + borderTop() + paddingTop());
|
| return;
|
| }
|
|
|
| @@ -3075,7 +3075,7 @@ void RenderBlock::adjustRectForColumns(LayoutRect& r) const
|
| LayoutPoint RenderBlock::flipForWritingModeIncludingColumns(const LayoutPoint& point) const
|
| {
|
| ASSERT(hasColumns());
|
| - if (!hasColumns() || !style()->isFlippedBlocksWritingMode())
|
| + if (!hasColumns() || !style()->slowIsFlippedBlocksWritingMode())
|
| return point;
|
| ColumnInfo* colInfo = columnInfo();
|
| LayoutUnit columnLogicalHeight = colInfo->columnHeight();
|
| @@ -3088,7 +3088,7 @@ LayoutPoint RenderBlock::flipForWritingModeIncludingColumns(const LayoutPoint& p
|
| void RenderBlock::adjustStartEdgeForWritingModeIncludingColumns(LayoutRect& rect) const
|
| {
|
| ASSERT(hasColumns());
|
| - if (!hasColumns() || !style()->isFlippedBlocksWritingMode())
|
| + if (!hasColumns() || !style()->slowIsFlippedBlocksWritingMode())
|
| return;
|
|
|
| ColumnInfo* colInfo = columnInfo();
|
|
|