Index: Source/core/rendering/RenderBlockLineLayout.cpp |
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp |
index e45d475b85a53643bf3442e3c967c8a7d9146084..6546388b4bfd51d870e834a27958dfdcf1c7b24c 100644 |
--- a/Source/core/rendering/RenderBlockLineLayout.cpp |
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp |
@@ -256,7 +256,7 @@ RootInlineBox* RenderBlockFlow::constructLine(BidiRunList<BidiRun>& bidiRuns, co |
if (!box) |
continue; |
- if (!rootHasSelectedChildren && box->renderer()->selectionState() != RenderObject::SelectionNone) |
+ if (!rootHasSelectedChildren && box->renderer().selectionState() != RenderObject::SelectionNone) |
rootHasSelectedChildren = true; |
// If we have no parent box yet, or if the run is not simply a sibling, |
@@ -265,7 +265,7 @@ RootInlineBox* RenderBlockFlow::constructLine(BidiRunList<BidiRun>& bidiRuns, co |
// they are positioned separately. |
bool runStartsSegment = r->m_startsSegment; |
- if (!parentBox || parentBox->renderer() != r->m_object->parent() || runStartsSegment) |
+ if (!parentBox || &parentBox->renderer() != r->m_object->parent() || runStartsSegment) |
// Create new inline boxes all the way back to the appropriate insertion point. |
parentBox = createLineBoxes(r->m_object->parent(), lineInfo, box, runStartsSegment); |
else { |
@@ -961,11 +961,11 @@ void RenderBlockFlow::layoutRunsAndFloats(LineLayoutState& layoutState) |
// adjust the height accordingly. |
// A line break can be either the first or the last object on a line, depending on its direction. |
if (InlineBox* lastLeafChild = lastRootBox()->lastLeafChild()) { |
- RenderObject* lastObject = lastLeafChild->renderer(); |
- if (!lastObject->isBR()) |
+ RenderObject& lastObject = lastLeafChild->renderer(); |
+ if (!lastObject.isBR()) |
lastObject = lastRootBox()->firstLeafChild()->renderer(); |
- if (lastObject->isBR()) { |
- EClear clear = lastObject->style()->clear(); |
+ if (lastObject.isBR()) { |
+ EClear clear = lastObject.style()->clear(); |
if (clear != CNONE) |
clearFloats(clear); |
} |
@@ -1423,7 +1423,7 @@ void RenderBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState) |
if (layoutState.checkForFloatsFromLastLine()) { |
LayoutUnit bottomVisualOverflow = lastRootBox()->logicalBottomVisualOverflow(); |
LayoutUnit bottomLayoutOverflow = lastRootBox()->logicalBottomLayoutOverflow(); |
- TrailingFloatsRootInlineBox* trailingFloatsLineBox = new TrailingFloatsRootInlineBox(this); |
+ TrailingFloatsRootInlineBox* trailingFloatsLineBox = new TrailingFloatsRootInlineBox(*this); |
m_lineBoxes.appendLineBox(trailingFloatsLineBox); |
trailingFloatsLineBox->setConstructed(); |
GlyphOverflowAndFallbackFontsMap textBoxDataMap; |