Index: Source/core/rendering/RenderBlockLineLayout.cpp |
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp |
index 906875676cad979d26f8d912d073df0cda2ac342..26ce5c2e5870f944f064392f3be7d70d4864bc05 100644 |
--- a/Source/core/rendering/RenderBlockLineLayout.cpp |
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp |
@@ -1017,7 +1017,7 @@ static inline void pushShapeContentOverflowBelowTheContentBox(RenderBlockFlow* b |
LayoutUnit shapeLogicalBottom = shapeInsideInfo->shapeLogicalBottom(); |
LayoutUnit shapeContainingBlockHeight = shapeInsideInfo->shapeContainingBlockHeight(); |
- bool isOverflowPositionedAlready = (shapeContainingBlockHeight - shapeInsideInfo->owner()->borderAndPaddingAfter() + lineHeight) <= lineTop; |
+ bool isOverflowPositionedAlready = (shapeContainingBlockHeight - shapeInsideInfo->owner().borderAndPaddingAfter() + lineHeight) <= lineTop; |
// If the last line overlaps with the shape, we don't need the segments anymore |
if (lineTop < shapeLogicalBottom && shapeLogicalBottom < logicalLineBottom) |
@@ -1025,7 +1025,7 @@ static inline void pushShapeContentOverflowBelowTheContentBox(RenderBlockFlow* b |
if (logicalLineBottom <= shapeLogicalBottom || !shapeContainingBlockHeight || isOverflowPositionedAlready) |
return; |
- LayoutUnit newLogicalHeight = block->logicalHeight() + (shapeContainingBlockHeight - (lineTop + shapeInsideInfo->owner()->borderAndPaddingAfter())); |
+ LayoutUnit newLogicalHeight = block->logicalHeight() + (shapeContainingBlockHeight - (lineTop + shapeInsideInfo->owner().borderAndPaddingAfter())); |
block->setLogicalHeight(newLogicalHeight); |
} |
@@ -1170,17 +1170,17 @@ void RenderBlockFlow::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, I |
LayoutSize logicalOffsetFromShapeContainer; |
ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo(); |
if (shapeInsideInfo) { |
- ASSERT(shapeInsideInfo->owner() == this || allowsShapeInsideInfoSharing(shapeInsideInfo->owner())); |
+ ASSERT(&shapeInsideInfo->owner() == this || allowsShapeInsideInfoSharing(&shapeInsideInfo->owner())); |
if (shapeInsideInfo != this->shapeInsideInfo()) { |
// FIXME Bug 100284: If subsequent LayoutStates are pushed, we will have to add |
// their offsets from the original shape-inside container. |
- logicalOffsetFromShapeContainer = logicalOffsetFromShapeAncestorContainer(shapeInsideInfo->owner()); |
+ logicalOffsetFromShapeContainer = logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner()); |
} |
// Begin layout at the logical top of our shape inside. |
if (logicalHeight() + logicalOffsetFromShapeContainer.height() < shapeInsideInfo->shapeLogicalTop()) { |
LayoutUnit logicalHeight = shapeInsideInfo->shapeLogicalTop() - logicalOffsetFromShapeContainer.height(); |
if (layoutState.flowThread()) |
- logicalHeight -= shapeInsideInfo->owner()->borderAndPaddingBefore(); |
+ logicalHeight -= shapeInsideInfo->owner().borderAndPaddingBefore(); |
setLogicalHeight(logicalHeight); |
} |
} |