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

Unified Diff: Source/core/layout/line/AbstractInlineTextBox.h

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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/layout/TextRunConstructor.cpp ('k') | Source/core/layout/line/AbstractInlineTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/AbstractInlineTextBox.h
diff --git a/Source/core/layout/line/AbstractInlineTextBox.h b/Source/core/layout/line/AbstractInlineTextBox.h
index 858bebc8704f4f3376c05c93bcfd09d11b6c9e97..6bf7295dfadb9fcffd538c184ed64990f9e8dfbd 100644
--- a/Source/core/layout/line/AbstractInlineTextBox.h
+++ b/Source/core/layout/line/AbstractInlineTextBox.h
@@ -32,9 +32,9 @@
#define AbstractInlineTextBox_h
#include "core/dom/Range.h"
+#include "core/layout/LayoutText.h"
#include "core/layout/line/FloatToLayoutUnit.h"
#include "core/layout/line/InlineTextBox.h"
-#include "core/rendering/RenderText.h"
#include "wtf/HashMap.h"
#include "wtf/RefPtr.h"
@@ -46,16 +46,16 @@ class InlineTextBox;
// get information about InlineTextBoxes without tight coupling.
class AbstractInlineTextBox : public RefCounted<AbstractInlineTextBox> {
private:
- AbstractInlineTextBox(RenderText* renderText, InlineTextBox* inlineTextBox)
+ AbstractInlineTextBox(LayoutText* renderText, InlineTextBox* inlineTextBox)
: m_renderText(renderText)
, m_inlineTextBox(inlineTextBox)
{
}
- static PassRefPtr<AbstractInlineTextBox> getOrCreate(RenderText*, InlineTextBox*);
+ static PassRefPtr<AbstractInlineTextBox> getOrCreate(LayoutText*, InlineTextBox*);
static void willDestroy(InlineTextBox*);
- friend class RenderText;
+ friend class LayoutText;
friend class InlineTextBox;
public:
@@ -72,7 +72,7 @@ public:
BottomToTop
};
- RenderText* renderText() const { return m_renderText; }
+ LayoutText* renderText() const { return m_renderText; }
PassRefPtr<AbstractInlineTextBox> nextInlineTextBox() const;
LayoutRect bounds() const;
@@ -86,7 +86,7 @@ private:
void detach();
// Weak ptrs; these are nulled when InlineTextBox::destroy() calls AbstractInlineTextBox::willDestroy.
- RenderText* m_renderText;
+ LayoutText* m_renderText;
InlineTextBox* m_inlineTextBox;
typedef HashMap<InlineTextBox*, RefPtr<AbstractInlineTextBox>> InlineToAbstractInlineTextBoxHashMap;
« no previous file with comments | « Source/core/layout/TextRunConstructor.cpp ('k') | Source/core/layout/line/AbstractInlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698