Index: Source/core/rendering/RenderBlockLineLayout.cpp |
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp |
index fe39f37ecbd40f836fb89ef236e260701f426ae1..bec0a8da19addb7d4ce11848be2fa8d9d672260b 100644 |
--- a/Source/core/rendering/RenderBlockLineLayout.cpp |
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp |
@@ -976,8 +976,8 @@ static inline void constructBidiRunsForLine(const RenderBlockFlow* block, Inline |
iterator = segmentRanges[i].end; |
InlineIterator segmentEnd(iterator.root, iterator.object, iterator.offset); |
if (i) { |
- ASSERT(segmentStart.m_obj); |
- BidiRun* segmentMarker = createRun(segmentStart.m_pos, segmentStart.m_pos, segmentStart.m_obj, topResolver); |
+ ASSERT(segmentStart.object()); |
+ BidiRun* segmentMarker = createRun(segmentStart.m_pos, segmentStart.m_pos, segmentStart.object(), topResolver); |
segmentMarker->m_startsSegment = true; |
bidiRuns.addRun(segmentMarker); |
// Do not collapse midpoints between segments |
@@ -997,7 +997,7 @@ RootInlineBox* RenderBlockFlow::createLineBoxesFromBidiRuns(unsigned bidiLevel, |
return 0; |
// FIXME: Why is this only done when we had runs? |
- lineInfo.setLastLine(!end.m_obj); |
+ lineInfo.setLastLine(!end.object()); |
RootInlineBox* lineBox = constructLine(bidiRuns, lineInfo); |
if (!lineBox) |
@@ -1445,7 +1445,7 @@ void RenderBlockFlow::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, I |
// This is a short-cut for empty lines. |
if (layoutState.lineInfo().isEmpty()) { |
if (lastRootBox()) |
- lastRootBox()->setLineBreakInfo(endOfLine.m_obj, endOfLine.m_pos, resolver.status()); |
+ lastRootBox()->setLineBreakInfo(endOfLine.object(), endOfLine.m_pos, resolver.status()); |
} else { |
VisualDirectionOverride override = (styleToUse->rtlOrdering() == VisualOrder ? (styleToUse->direction() == LTR ? VisualLeftToRightOverride : VisualRightToLeftOverride) : NoVisualOverride); |
@@ -1477,7 +1477,7 @@ void RenderBlockFlow::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, I |
resolver.markCurrentRunEmpty(); // FIXME: This can probably be replaced by an ASSERT (or just removed). |
if (lineBox) { |
- lineBox->setLineBreakInfo(endOfLine.m_obj, endOfLine.m_pos, resolver.status()); |
+ lineBox->setLineBreakInfo(endOfLine.object(), endOfLine.m_pos, resolver.status()); |
if (layoutState.usesRepaintBounds()) |
layoutState.updateRepaintRangeFromBox(lineBox); |
@@ -2052,7 +2052,7 @@ bool RenderBlockFlow::matchedEndLine(LineLayoutState& layoutState, const InlineB |
RootInlineBox* originalEndLine = layoutState.endLine(); |
RootInlineBox* line = originalEndLine; |
for (int i = 0; i < numLines && line; i++, line = line->nextRootBox()) { |
- if (line->lineBreakObj() == resolver.position().m_obj && line->lineBreakPos() == resolver.position().m_pos) { |
+ if (line->lineBreakObj() == resolver.position().object() && line->lineBreakPos() == resolver.position().m_pos) { |
// We have a match. |
if (line->lineBreakBidiStatus() != resolver.status()) |
return false; // ...but the bidi state doesn't match. |
@@ -2091,7 +2091,7 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo& |
FloatingObject* lastFloatFromPreviousLine, LineWidth& width) |
{ |
while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) { |
- RenderObject* object = resolver.position().m_obj; |
+ RenderObject* object = resolver.position().object(); |
if (object->isOutOfFlowPositioned()) { |
setStaticPositions(m_block, toRenderBox(object)); |
if (object->style()->isOriginalDisplayInlineType()) { |