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

Unified Diff: Source/core/dom/Text.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/Text.cpp
diff --git a/Source/core/dom/Text.cpp b/Source/core/dom/Text.cpp
index 4dda068e7fac0254075edab50ae406ab9e77d544..5f338530a0d755d88e3f28d864e215f4853c200b 100644
--- a/Source/core/dom/Text.cpp
+++ b/Source/core/dom/Text.cpp
@@ -33,9 +33,9 @@
#include "core/dom/RenderTreeBuilder.h"
#include "core/dom/shadow/ShadowRoot.h"
#include "core/events/ScopedEventQueue.h"
+#include "core/layout/LayoutCombineText.h"
+#include "core/layout/LayoutText.h"
#include "core/layout/svg/LayoutSVGInlineText.h"
-#include "core/rendering/RenderCombineText.h"
-#include "core/rendering/RenderText.h"
#include "core/svg/SVGForeignObjectElement.h"
#include "wtf/text/CString.h"
#include "wtf/text/StringBuilder.h"
@@ -350,15 +350,15 @@ static bool isSVGText(Text* text)
return parentOrShadowHostNode->isSVGElement() && !isSVGForeignObjectElement(*parentOrShadowHostNode);
}
-RenderText* Text::createTextRenderer(LayoutStyle* style)
+LayoutText* Text::createTextRenderer(LayoutStyle* style)
{
if (isSVGText(this))
return new LayoutSVGInlineText(this, dataImpl());
if (style->hasTextCombine())
- return new RenderCombineText(this, dataImpl());
+ return new LayoutCombineText(this, dataImpl());
- return new RenderText(this, dataImpl());
+ return new LayoutText(this, dataImpl());
}
void Text::attach(const AttachContext& context)
@@ -400,7 +400,7 @@ void Text::reattachIfNeeded(const AttachContext& context)
void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling)
{
- if (RenderText* renderer = this->renderer()) {
+ if (LayoutText* renderer = this->renderer()) {
if (change != NoChange || needsStyleRecalc())
renderer->setStyle(document().ensureStyleResolver().styleForText(this));
if (needsStyleRecalc())
@@ -427,7 +427,7 @@ void Text::updateTextRenderer(unsigned offsetOfReplacedData, unsigned lengthOfRe
{
if (!inActiveDocument())
return;
- RenderText* textRenderer = renderer();
+ LayoutText* textRenderer = renderer();
if (!textRenderer || !textRendererIsNeeded(*textRenderer->style(), *textRenderer->parent())) {
lazyReattachIfAttached();
// FIXME: Editing should be updated so this is not neccesary.

Powered by Google App Engine
This is Rietveld 408576698