| Index: Source/core/page/TouchAdjustment.cpp
|
| diff --git a/Source/core/page/TouchAdjustment.cpp b/Source/core/page/TouchAdjustment.cpp
|
| index 5ab56fb839fb46b57426a8e9bf150b1f60df6122..4e2327b6d3b2f28d6819471ddd5cda72be447aaf 100644
|
| --- a/Source/core/page/TouchAdjustment.cpp
|
| +++ b/Source/core/page/TouchAdjustment.cpp
|
| @@ -29,8 +29,8 @@
|
| #include "core/frame/FrameView.h"
|
| #include "core/frame/LocalFrame.h"
|
| #include "core/html/HTMLFrameOwnerElement.h"
|
| +#include "core/layout/LayoutObject.h"
|
| #include "core/rendering/RenderBox.h"
|
| -#include "core/rendering/RenderObject.h"
|
| #include "core/rendering/RenderText.h"
|
| #include "core/rendering/style/RenderStyle.h"
|
| #include "platform/geometry/FloatPoint.h"
|
| @@ -131,7 +131,7 @@ bool providesContextMenuItems(Node* node)
|
| return true;
|
| // Only the selected part of the renderer is a valid target, but this will be corrected in
|
| // appendContextSubtargetsForNode.
|
| - if (node->renderer()->selectionState() != RenderObject::SelectionNone)
|
| + if (node->renderer()->selectionState() != LayoutObject::SelectionNone)
|
| return true;
|
| }
|
| return false;
|
| @@ -185,24 +185,24 @@ static inline void appendContextSubtargetsForNode(Node* node, SubtargetGeometryL
|
| lastOffset = offset;
|
| }
|
| } else {
|
| - if (textRenderer->selectionState() == RenderObject::SelectionNone)
|
| + if (textRenderer->selectionState() == LayoutObject::SelectionNone)
|
| return appendBasicSubtargetsForNode(node, subtargets);
|
| // If selected, make subtargets out of only the selected part of the text.
|
| int startPos, endPos;
|
| switch (textRenderer->selectionState()) {
|
| - case RenderObject::SelectionInside:
|
| + case LayoutObject::SelectionInside:
|
| startPos = 0;
|
| endPos = textRenderer->textLength();
|
| break;
|
| - case RenderObject::SelectionStart:
|
| + case LayoutObject::SelectionStart:
|
| textRenderer->selectionStartEnd(startPos, endPos);
|
| endPos = textRenderer->textLength();
|
| break;
|
| - case RenderObject::SelectionEnd:
|
| + case LayoutObject::SelectionEnd:
|
| textRenderer->selectionStartEnd(startPos, endPos);
|
| startPos = 0;
|
| break;
|
| - case RenderObject::SelectionBoth:
|
| + case LayoutObject::SelectionBoth:
|
| textRenderer->selectionStartEnd(startPos, endPos);
|
| break;
|
| default:
|
|
|