Index: Source/core/rendering/RenderBlockLineLayout.cpp |
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp |
index c767109eceb31cf16d096eb33c9f35b7255198c2..1facbb200aab15e871b84ddfea7ac0837ba8052a 100644 |
--- a/Source/core/rendering/RenderBlockLineLayout.cpp |
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp |
@@ -364,8 +364,8 @@ void RenderBlockFlow::setMarginsForRubyRun(BidiRun* run, RenderRubyRun* renderer |
} |
} |
renderer->getOverhang(lineInfo.isFirstLine(), renderer->style()->isLeftToRightDirection() ? previousObject : nextObject, renderer->style()->isLeftToRightDirection() ? nextObject : previousObject, startOverhang, endOverhang); |
- setMarginStartForChild(renderer, -startOverhang); |
- setMarginEndForChild(renderer, -endOverhang); |
+ setMarginStartForChild(*renderer, -startOverhang); |
+ setMarginEndForChild(*renderer, -endOverhang); |
} |
static inline void setLogicalWidthForTextRun(RootInlineBox* lineBox, BidiRun* run, RenderText* renderer, float xPos, const LineInfo& lineInfo, |
@@ -622,8 +622,8 @@ BidiRun* RenderBlockFlow::computeInlineDirectionPositionsForSegment(RootInlineBo |
RenderBox* renderBox = toRenderBox(r->m_object); |
if (renderBox->isRubyRun()) |
setMarginsForRubyRun(r, toRenderRubyRun(renderBox), previousObject, lineInfo); |
- r->m_box->setLogicalWidth(logicalWidthForChild(renderBox).toFloat()); |
- totalLogicalWidth += marginStartForChild(renderBox) + marginEndForChild(renderBox); |
+ r->m_box->setLogicalWidth(logicalWidthForChild(*renderBox).toFloat()); |
+ totalLogicalWidth += marginStartForChild(*renderBox) + marginEndForChild(*renderBox); |
needsWordSpacing = true; |
} |
} |
@@ -1014,7 +1014,7 @@ void RenderBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState) |
FloatingObject* floatingObject = insertFloatingObject(*f); |
ASSERT(!floatingObject->originatingLine()); |
floatingObject->setOriginatingLine(line); |
- setLogicalHeight(logicalTopForChild(*f) - marginBeforeForChild(*f) + delta); |
+ setLogicalHeight(logicalTopForChild(**f) - marginBeforeForChild(**f) + delta); |
positionNewFloats(); |
} |
} |
@@ -1561,7 +1561,7 @@ void RenderBlockFlow::layoutInlineChildren(bool relayoutChildren, LayoutUnit& pa |
if (o->isReplaced() || o->isFloating() || o->isOutOfFlowPositioned()) { |
RenderBox* box = toRenderBox(o); |
- updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, box); |
+ updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, *box); |
if (o->isOutOfFlowPositioned()) |
o->containingBlock()->insertPositionedObject(box); |
@@ -1738,7 +1738,7 @@ RootInlineBox* RenderBlockFlow::determineStartPosition(LineLayoutState& layoutSt |
FloatingObject* floatingObject = insertFloatingObject(*f); |
ASSERT(!floatingObject->originatingLine()); |
floatingObject->setOriginatingLine(line); |
- setLogicalHeight(logicalTopForChild(*f) - marginBeforeForChild(*f)); |
+ setLogicalHeight(logicalTopForChild(**f) - marginBeforeForChild(**f)); |
positionNewFloats(); |
ASSERT(layoutState.floats()[numCleanFloats].object == *f); |
numCleanFloats++; |
@@ -2017,7 +2017,7 @@ bool RenderBlockFlow::positionNewFloatOnLine(FloatingObject* newFloat, FloatingO |
if (logicalTopForFloat(floatingObject) == logicalHeight() + lineInfo.floatPaginationStrut()) { |
floatingObject->setPaginationStrut(paginationStrut + floatingObject->paginationStrut()); |
RenderBox* floatBox = floatingObject->renderer(); |
- setLogicalTopForChild(floatBox, logicalTopForChild(floatBox) + marginBeforeForChild(floatBox) + paginationStrut); |
+ setLogicalTopForChild(floatBox, logicalTopForChild(*floatBox) + marginBeforeForChild(*floatBox) + paginationStrut); |
if (floatBox->isRenderBlock()) |
floatBox->forceChildLayout(); |
else |