| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index ad8750d6c1bd7888d15586357595ecfd9898c9b9..9baf6840fa5bf2471f9094c55f50d74551c0db9e 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -3046,14 +3046,14 @@ Position RenderBlock::positionForBox(InlineBox *box, bool start) const
|
| if (!box)
|
| return Position();
|
|
|
| - if (!box->renderer()->nonPseudoNode())
|
| + if (!box->renderer().nonPseudoNode())
|
| return createLegacyEditingPosition(nonPseudoNode(), start ? caretMinOffset() : caretMaxOffset());
|
|
|
| if (!box->isInlineTextBox())
|
| - return createLegacyEditingPosition(box->renderer()->nonPseudoNode(), start ? box->renderer()->caretMinOffset() : box->renderer()->caretMaxOffset());
|
| + return createLegacyEditingPosition(box->renderer().nonPseudoNode(), start ? box->renderer().caretMinOffset() : box->renderer().caretMaxOffset());
|
|
|
| InlineTextBox* textBox = toInlineTextBox(box);
|
| - return createLegacyEditingPosition(box->renderer()->nonPseudoNode(), start ? textBox->start() : textBox->start() + textBox->len());
|
| + return createLegacyEditingPosition(box->renderer().nonPseudoNode(), start ? textBox->start() : textBox->start() + textBox->len());
|
| }
|
|
|
| static inline bool isEditingBoundary(RenderObject* ancestor, RenderObject* child)
|
| @@ -3168,9 +3168,9 @@ PositionWithAffinity RenderBlock::positionForPointWithInlineChildren(const Layou
|
| LayoutPoint point(pointInLogicalContents.x(), closestBox->root()->blockDirectionPointInLine());
|
| if (!isHorizontalWritingMode())
|
| point = point.transposedPoint();
|
| - if (closestBox->renderer()->isReplaced())
|
| - return positionForPointRespectingEditingBoundaries(this, toRenderBox(closestBox->renderer()), point);
|
| - return closestBox->renderer()->positionForPoint(point);
|
| + if (closestBox->renderer().isReplaced())
|
| + return positionForPointRespectingEditingBoundaries(this, &toRenderBox(closestBox->renderer()), point);
|
| + return closestBox->renderer().positionForPoint(point);
|
| }
|
|
|
| if (lastRootBoxWithChildren) {
|
|
|