| Index: Source/core/rendering/RenderTableCell.cpp
|
| diff --git a/Source/core/rendering/RenderTableCell.cpp b/Source/core/rendering/RenderTableCell.cpp
|
| index 910a1c95f39bf7303c5b8320c10f56de81ddf9b5..17dbbb7b33ebbf62cc14b8d09ee5b39fbfc1d83a 100644
|
| --- a/Source/core/rendering/RenderTableCell.cpp
|
| +++ b/Source/core/rendering/RenderTableCell.cpp
|
| @@ -857,27 +857,27 @@ inline CollapsedBorderValue RenderTableCell::cachedCollapsedLeftBorder(const Ren
|
| {
|
| if (styleForCellFlow->isHorizontalWritingMode())
|
| return styleForCellFlow->isLeftToRightDirection() ? section()->cachedCollapsedBorder(this, CBSStart) : section()->cachedCollapsedBorder(this, CBSEnd);
|
| - return styleForCellFlow->isFlippedBlocksWritingMode() ? section()->cachedCollapsedBorder(this, CBSAfter) : section()->cachedCollapsedBorder(this, CBSBefore);
|
| + return styleForCellFlow->slowIsFlippedBlocksWritingMode() ? section()->cachedCollapsedBorder(this, CBSAfter) : section()->cachedCollapsedBorder(this, CBSBefore);
|
| }
|
|
|
| inline CollapsedBorderValue RenderTableCell::cachedCollapsedRightBorder(const RenderStyle* styleForCellFlow) const
|
| {
|
| if (styleForCellFlow->isHorizontalWritingMode())
|
| return styleForCellFlow->isLeftToRightDirection() ? section()->cachedCollapsedBorder(this, CBSEnd) : section()->cachedCollapsedBorder(this, CBSStart);
|
| - return styleForCellFlow->isFlippedBlocksWritingMode() ? section()->cachedCollapsedBorder(this, CBSBefore) : section()->cachedCollapsedBorder(this, CBSAfter);
|
| + return styleForCellFlow->slowIsFlippedBlocksWritingMode() ? section()->cachedCollapsedBorder(this, CBSBefore) : section()->cachedCollapsedBorder(this, CBSAfter);
|
| }
|
|
|
| inline CollapsedBorderValue RenderTableCell::cachedCollapsedTopBorder(const RenderStyle* styleForCellFlow) const
|
| {
|
| if (styleForCellFlow->isHorizontalWritingMode())
|
| - return styleForCellFlow->isFlippedBlocksWritingMode() ? section()->cachedCollapsedBorder(this, CBSAfter) : section()->cachedCollapsedBorder(this, CBSBefore);
|
| + return styleForCellFlow->slowIsFlippedBlocksWritingMode() ? section()->cachedCollapsedBorder(this, CBSAfter) : section()->cachedCollapsedBorder(this, CBSBefore);
|
| return styleForCellFlow->isLeftToRightDirection() ? section()->cachedCollapsedBorder(this, CBSStart) : section()->cachedCollapsedBorder(this, CBSEnd);
|
| }
|
|
|
| inline CollapsedBorderValue RenderTableCell::cachedCollapsedBottomBorder(const RenderStyle* styleForCellFlow) const
|
| {
|
| if (styleForCellFlow->isHorizontalWritingMode())
|
| - return styleForCellFlow->isFlippedBlocksWritingMode() ? section()->cachedCollapsedBorder(this, CBSBefore) : section()->cachedCollapsedBorder(this, CBSAfter);
|
| + return styleForCellFlow->slowIsFlippedBlocksWritingMode() ? section()->cachedCollapsedBorder(this, CBSBefore) : section()->cachedCollapsedBorder(this, CBSAfter);
|
| return styleForCellFlow->isLeftToRightDirection() ? section()->cachedCollapsedBorder(this, CBSEnd) : section()->cachedCollapsedBorder(this, CBSStart);
|
| }
|
|
|
| @@ -928,7 +928,7 @@ int RenderTableCell::borderHalfLeft(bool outer) const
|
| const RenderStyle* styleForCellFlow = this->styleForCellFlow();
|
| if (styleForCellFlow->isHorizontalWritingMode())
|
| return styleForCellFlow->isLeftToRightDirection() ? borderHalfStart(outer) : borderHalfEnd(outer);
|
| - return styleForCellFlow->isFlippedBlocksWritingMode() ? borderHalfAfter(outer) : borderHalfBefore(outer);
|
| + return styleForCellFlow->slowIsFlippedBlocksWritingMode() ? borderHalfAfter(outer) : borderHalfBefore(outer);
|
| }
|
|
|
| int RenderTableCell::borderHalfRight(bool outer) const
|
| @@ -936,14 +936,14 @@ int RenderTableCell::borderHalfRight(bool outer) const
|
| const RenderStyle* styleForCellFlow = this->styleForCellFlow();
|
| if (styleForCellFlow->isHorizontalWritingMode())
|
| return styleForCellFlow->isLeftToRightDirection() ? borderHalfEnd(outer) : borderHalfStart(outer);
|
| - return styleForCellFlow->isFlippedBlocksWritingMode() ? borderHalfBefore(outer) : borderHalfAfter(outer);
|
| + return styleForCellFlow->slowIsFlippedBlocksWritingMode() ? borderHalfBefore(outer) : borderHalfAfter(outer);
|
| }
|
|
|
| int RenderTableCell::borderHalfTop(bool outer) const
|
| {
|
| const RenderStyle* styleForCellFlow = this->styleForCellFlow();
|
| if (styleForCellFlow->isHorizontalWritingMode())
|
| - return styleForCellFlow->isFlippedBlocksWritingMode() ? borderHalfAfter(outer) : borderHalfBefore(outer);
|
| + return styleForCellFlow->slowIsFlippedBlocksWritingMode() ? borderHalfAfter(outer) : borderHalfBefore(outer);
|
| return styleForCellFlow->isLeftToRightDirection() ? borderHalfStart(outer) : borderHalfEnd(outer);
|
| }
|
|
|
| @@ -951,7 +951,7 @@ int RenderTableCell::borderHalfBottom(bool outer) const
|
| {
|
| const RenderStyle* styleForCellFlow = this->styleForCellFlow();
|
| if (styleForCellFlow->isHorizontalWritingMode())
|
| - return styleForCellFlow->isFlippedBlocksWritingMode() ? borderHalfBefore(outer) : borderHalfAfter(outer);
|
| + return styleForCellFlow->slowIsFlippedBlocksWritingMode() ? borderHalfBefore(outer) : borderHalfAfter(outer);
|
| return styleForCellFlow->isLeftToRightDirection() ? borderHalfEnd(outer) : borderHalfStart(outer);
|
| }
|
|
|
| @@ -975,7 +975,7 @@ int RenderTableCell::borderHalfBefore(bool outer) const
|
| {
|
| CollapsedBorderValue border = collapsedBeforeBorder(DoNotIncludeBorderColor);
|
| if (border.exists())
|
| - return (border.width() + ((styleForCellFlow()->isFlippedBlocksWritingMode() ^ outer) ? 0 : 1)) / 2; // Give the extra pixel to top and left.
|
| + return (border.width() + ((styleForCellFlow()->slowIsFlippedBlocksWritingMode() ^ outer) ? 0 : 1)) / 2; // Give the extra pixel to top and left.
|
| return 0;
|
| }
|
|
|
| @@ -983,7 +983,7 @@ int RenderTableCell::borderHalfAfter(bool outer) const
|
| {
|
| CollapsedBorderValue border = collapsedAfterBorder(DoNotIncludeBorderColor);
|
| if (border.exists())
|
| - return (border.width() + ((styleForCellFlow()->isFlippedBlocksWritingMode() ^ outer) ? 1 : 0)) / 2;
|
| + return (border.width() + ((styleForCellFlow()->slowIsFlippedBlocksWritingMode() ^ outer) ? 1 : 0)) / 2;
|
| return 0;
|
| }
|
|
|
|
|