Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(610)

Unified Diff: Source/core/dom/ContainerNode.cpp

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merge w/HEAD again Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/ContainerNode.cpp
diff --git a/Source/core/dom/ContainerNode.cpp b/Source/core/dom/ContainerNode.cpp
index 153993f9cd830ede19eb0a3a72e6d0bbd9a1a176..fcf0cd9492f67a929820f99fa5a3cf617b88fbac 100644
--- a/Source/core/dom/ContainerNode.cpp
+++ b/Source/core/dom/ContainerNode.cpp
@@ -45,11 +45,11 @@
#include "core/html/HTMLTagCollection.h"
#include "core/html/RadioNodeList.h"
#include "core/inspector/InspectorInstrumentation.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/RenderInline.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;

Powered by Google App Engine
This is Rietveld 408576698