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

Unified Diff: Source/core/rendering/svg/RenderSVGInlineText.h

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/rendering/svg/RenderSVGInline.cpp ('k') | Source/core/rendering/svg/RenderSVGInlineText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGInlineText.h
diff --git a/Source/core/rendering/svg/RenderSVGInlineText.h b/Source/core/rendering/svg/RenderSVGInlineText.h
index d91b5100860b1d46baa9ba6af56947cfaae46525..d7ee1b3f1276665a355fb39ac24363ceebf013e3 100644
--- a/Source/core/rendering/svg/RenderSVGInlineText.h
+++ b/Source/core/rendering/svg/RenderSVGInlineText.h
@@ -38,7 +38,7 @@ public:
float scalingFactor() const { return m_scalingFactor; }
const Font& scaledFont() const { return m_scaledFont; }
void updateScaledFont();
- static void computeNewScaledFontForStyle(RenderObject*, const RenderStyle*, float& scalingFactor, Font& scaledFont);
+ static void computeNewScaledFontForStyle(LayoutObject*, const RenderStyle*, float& scalingFactor, Font& scaledFont);
// Preserves floating point precision for the use in DRT. It knows how to round and does a better job than enclosingIntRect.
FloatRect floatLinesBoundingBox() const;
@@ -53,7 +53,7 @@ private:
virtual FloatRect objectBoundingBox() const override { return floatLinesBoundingBox(); }
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVG || type == RenderObjectSVGInlineText || RenderText::isOfType(type); }
+ virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVG || type == LayoutObjectSVGInlineText || RenderText::isOfType(type); }
virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override;
virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) override;
@@ -67,7 +67,7 @@ private:
SVGTextLayoutAttributes m_layoutAttributes;
};
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGInlineText, isSVGInlineText());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderSVGInlineText, isSVGInlineText());
}
« no previous file with comments | « Source/core/rendering/svg/RenderSVGInline.cpp ('k') | Source/core/rendering/svg/RenderSVGInlineText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698