| Index: Source/core/dom/ContainerNode.cpp
|
| diff --git a/Source/core/dom/ContainerNode.cpp b/Source/core/dom/ContainerNode.cpp
|
| index bbf7f396b211347f7ded5b89688e034c0b804a94..8a0719d4ad6a51514c6f49032926929666e23068 100644
|
| --- a/Source/core/dom/ContainerNode.cpp
|
| +++ b/Source/core/dom/ContainerNode.cpp
|
| @@ -46,10 +46,10 @@
|
| #include "core/html/RadioNodeList.h"
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| #include "core/layout/LayoutInline.h"
|
| +#include "core/layout/LayoutText.h"
|
| #include "core/layout/LayoutTheme.h"
|
| #include "core/layout/LayoutView.h"
|
| #include "core/layout/line/InlineTextBox.h"
|
| -#include "core/rendering/RenderText.h"
|
| #include "platform/EventDispatchForbiddenScope.h"
|
| #include "platform/ScriptForbiddenScope.h"
|
|
|
| @@ -901,12 +901,12 @@ bool ContainerNode::getUpperLeftCorner(FloatPoint& point) const
|
| return true;
|
| }
|
|
|
| - if (p->node() && p->node() == this && o->isText() && !o->isBR() && !toRenderText(o)->firstTextBox()) {
|
| + if (p->node() && p->node() == this && o->isText() && !o->isBR() && !toLayoutText(o)->firstTextBox()) {
|
| // Do nothing - skip unrendered whitespace that is a child or next sibling of the anchor.
|
| } else if ((o->isText() && !o->isBR()) || o->isReplaced()) {
|
| point = FloatPoint();
|
| - if (o->isText() && toRenderText(o)->firstTextBox()) {
|
| - point.move(toRenderText(o)->linesBoundingBox().x(), toRenderText(o)->firstTextBox()->root().lineTop().toFloat());
|
| + if (o->isText() && toLayoutText(o)->firstTextBox()) {
|
| + point.move(toLayoutText(o)->linesBoundingBox().x(), toLayoutText(o)->firstTextBox()->root().lineTop().toFloat());
|
| } else if (o->isBox()) {
|
| LayoutBox* box = toLayoutBox(o);
|
| point.moveBy(box->location());
|
| @@ -993,7 +993,7 @@ bool ContainerNode::getLowerRightCorner(FloatPoint& point) const
|
| if (o->isText() || o->isReplaced()) {
|
| point = FloatPoint();
|
| if (o->isText()) {
|
| - RenderText* text = toRenderText(o);
|
| + LayoutText* text = toLayoutText(o);
|
| IntRect linesBox = text->linesBoundingBox();
|
| if (!linesBox.maxX() && !linesBox.maxY())
|
| continue;
|
|
|