Index: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
index 72951090977244960c790aeb0295210324c88a35..2769ce4aa7677d610b11012db7e306298b7010f8 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
@@ -283,14 +283,14 @@ RootInlineBox* LayoutBlockFlow::constructLine(BidiRunList<BidiRun>& bidiRuns, co |
if (!box) |
continue; |
- if (!rootHasSelectedChildren && box->layoutObject().selectionState() != SelectionNone) |
+ if (!rootHasSelectedChildren && box->lineLayoutItem().selectionState() != SelectionNone) |
rootHasSelectedChildren = true; |
// If we have no parent box yet, or if the run is not simply a sibling, |
// then we need to construct inline boxes as necessary to properly enclose the |
// run's inline box. Segments can only be siblings at the root level, as |
// they are positioned separately. |
- if (!parentBox || parentBox->layoutObject() != r->m_object->parent()) { |
+ if (!parentBox || (!parentBox->lineLayoutItem().isEqual(r->m_object->parent()))) { |
// Create new inline boxes all the way back to the appropriate insertion point. |
parentBox = createLineBoxes(r->m_object->parent(), lineInfo, box); |
} else { |