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

Unified Diff: Source/core/rendering/RenderText.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/RenderSearchField.h ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderText.h
diff --git a/Source/core/rendering/RenderText.h b/Source/core/rendering/RenderText.h
index 18911310252762d5798f8e52c6454ffdd2bcb430..9ce22a525b5f6a26ab950facad4b382a91224300 100644
--- a/Source/core/rendering/RenderText.h
+++ b/Source/core/rendering/RenderText.h
@@ -24,8 +24,8 @@
#define RenderText_h
#include "core/dom/Text.h"
+#include "core/layout/LayoutObject.h"
#include "core/layout/line/FloatToLayoutUnit.h"
-#include "core/rendering/RenderObject.h"
#include "platform/LengthFunctions.h"
#include "platform/text/TextPath.h"
#include "wtf/Forward.h"
@@ -36,7 +36,7 @@ namespace blink {
class AbstractInlineTextBox;
class InlineTextBox;
-class RenderText : public RenderObject {
+class RenderText : public LayoutObject {
public:
// FIXME: If the node argument is not a Text node or the string argument is
// not the content of the Text node, updating text-transform property
@@ -164,7 +164,7 @@ private:
// Make length() private so that callers that have a RenderText*
// will use the more efficient textLength() instead, while
- // callers with a RenderObject* can continue to use length().
+ // callers with a LayoutObject* can continue to use length().
virtual unsigned length() const override final { return textLength(); }
virtual void paint(const PaintInfo&, const LayoutPoint&) override final { ASSERT_NOT_REACHED(); }
@@ -225,7 +225,7 @@ inline UChar RenderText::characterAt(unsigned i) const
return uncheckedCharacterAt(i);
}
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderText, isText());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderText, isText());
#if !ENABLE(ASSERT)
inline void RenderText::checkConsistency() const
« no previous file with comments | « Source/core/rendering/RenderSearchField.h ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698