Index: Source/core/rendering/InlineBox.cpp |
diff --git a/Source/core/rendering/InlineBox.cpp b/Source/core/rendering/InlineBox.cpp |
index 05ef4904bbff1806637c720f74cfa6d33f557b18..b041ce251cb9ef175f7630242c9053703144190a 100644 |
--- a/Source/core/rendering/InlineBox.cpp |
+++ b/Source/core/rendering/InlineBox.cpp |
@@ -203,7 +203,7 @@ bool InlineBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result |
// own stacking context. (See Appendix E.2, section 6.4 on inline block/table elements in the CSS2.1 |
// specification.) |
LayoutPoint childPoint = accumulatedOffset; |
- if (parent()->renderer().style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock(). |
+ if (parent()->renderer().style()->slowIsFlippedBlocksWritingMode()) // Faster than calling containingBlock(). |
childPoint = renderer().containingBlock()->flipForWritingModeForChild(&toRenderBox(renderer()), childPoint); |
return renderer().hitTest(request, result, locationInContainer, childPoint); |
@@ -308,8 +308,9 @@ void InlineBox::clearKnownToHaveNoOverflow() |
FloatPoint InlineBox::locationIncludingFlipping() |
{ |
- if (!renderer().style()->isFlippedBlocksWritingMode()) |
+ if (!UNLIKELY(renderer().hasFlippedBlocksWritingMode())) |
pdr.
2014/10/21 23:35:34
Because hasFlippedBlocksWritingMode will be inline
|
return FloatPoint(x(), y()); |
+ |
RenderBlockFlow& block = root().block(); |
if (block.style()->isHorizontalWritingMode()) |
return FloatPoint(x(), block.height() - height() - y()); |
@@ -319,28 +320,28 @@ FloatPoint InlineBox::locationIncludingFlipping() |
void InlineBox::flipForWritingMode(FloatRect& rect) |
leviw_travelin_and_unemployed
2014/10/21 23:29:59
I wonder how much of a difference inlining these w
|
{ |
- if (!renderer().style()->isFlippedBlocksWritingMode()) |
+ if (!UNLIKELY(renderer().hasFlippedBlocksWritingMode())) |
return; |
root().block().flipForWritingMode(rect); |
} |
FloatPoint InlineBox::flipForWritingMode(const FloatPoint& point) |
{ |
- if (!renderer().style()->isFlippedBlocksWritingMode()) |
+ if (!UNLIKELY(renderer().hasFlippedBlocksWritingMode())) |
return point; |
return root().block().flipForWritingMode(point); |
} |
void InlineBox::flipForWritingMode(LayoutRect& rect) |
{ |
- if (!renderer().style()->isFlippedBlocksWritingMode()) |
+ if (!UNLIKELY(renderer().hasFlippedBlocksWritingMode())) |
return; |
root().block().flipForWritingMode(rect); |
} |
LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point) |
{ |
- if (!renderer().style()->isFlippedBlocksWritingMode()) |
+ if (!UNLIKELY(renderer().hasFlippedBlocksWritingMode())) |
return point; |
return root().block().flipForWritingMode(point); |
} |