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

Unified Diff: Source/core/layout/svg/LayoutSVGInlineText.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/layout/svg/LayoutSVGInlineText.cpp
diff --git a/Source/core/layout/svg/LayoutSVGInlineText.cpp b/Source/core/layout/svg/LayoutSVGInlineText.cpp
index 0ce57d28276d529424a79d697ffd00a841c630cc..3318a7ea37ea1c006f2081813a7f3a56cebf91be 100644
--- a/Source/core/layout/svg/LayoutSVGInlineText.cpp
+++ b/Source/core/layout/svg/LayoutSVGInlineText.cpp
@@ -60,7 +60,7 @@ static PassRefPtr<StringImpl> applySVGWhitespaceRules(PassRefPtr<StringImpl> str
}
LayoutSVGInlineText::LayoutSVGInlineText(Node* n, PassRefPtr<StringImpl> string)
- : RenderText(n, applySVGWhitespaceRules(string, false))
+ : LayoutText(n, applySVGWhitespaceRules(string, false))
, m_scalingFactor(1)
, m_layoutAttributes(this)
{
@@ -68,14 +68,14 @@ LayoutSVGInlineText::LayoutSVGInlineText(Node* n, PassRefPtr<StringImpl> string)
void LayoutSVGInlineText::setTextInternal(PassRefPtr<StringImpl> text)
{
- RenderText::setTextInternal(text);
+ LayoutText::setTextInternal(text);
if (LayoutSVGText* textRenderer = LayoutSVGText::locateLayoutSVGTextAncestor(this))
textRenderer->subtreeTextDidChange(this);
}
void LayoutSVGInlineText::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
{
- RenderText::styleDidChange(diff, oldStyle);
+ LayoutText::styleDidChange(diff, oldStyle);
updateScaledFont();
bool newPreserves = style() ? style()->whiteSpace() == PRE : false;
@@ -244,7 +244,7 @@ LayoutRect LayoutSVGInlineText::clippedOverflowRectForPaintInvalidation(const La
PassRefPtr<StringImpl> LayoutSVGInlineText::originalText() const
{
- RefPtr<StringImpl> result = RenderText::originalText();
+ RefPtr<StringImpl> result = LayoutText::originalText();
if (!result)
return nullptr;
return applySVGWhitespaceRules(result, style() && style()->whiteSpace() == PRE);

Powered by Google App Engine
This is Rietveld 408576698