| 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;
|
|
|