Index: Source/core/rendering/InlineBox.h |
diff --git a/Source/core/rendering/InlineBox.h b/Source/core/rendering/InlineBox.h |
index 5803cd17e2be61d2ab6c2f8c935e672d3829a6fe..5e739f33d4d8faa3bee4ecd7d6d3cffeb949ff30 100644 |
--- a/Source/core/rendering/InlineBox.h |
+++ b/Source/core/rendering/InlineBox.h |
@@ -34,26 +34,26 @@ class RootInlineBox; |
// some RenderObject (i.e., it represents a portion of that RenderObject). |
class InlineBox { |
public: |
- InlineBox(RenderObject* obj) |
+ InlineBox(RenderObject& obj) |
: m_next(0) |
, m_prev(0) |
, m_parent(0) |
- , m_renderer(obj) |
, m_logicalWidth(0) |
+ , m_renderer(obj) |
#ifndef NDEBUG |
, m_hasBadParent(false) |
#endif |
{ |
} |
- InlineBox(RenderObject* obj, FloatPoint topLeft, float logicalWidth, bool firstLine, bool constructed, |
+ InlineBox(RenderObject& obj, FloatPoint topLeft, float logicalWidth, bool firstLine, bool constructed, |
bool dirty, bool extracted, bool isHorizontal, InlineBox* next, InlineBox* prev, InlineFlowBox* parent) |
: m_next(next) |
, m_prev(prev) |
, m_parent(parent) |
- , m_renderer(obj) |
, m_topLeft(topLeft) |
, m_logicalWidth(logicalWidth) |
+ , m_renderer(obj) |
, m_bitfields(firstLine, constructed, dirty, extracted, isHorizontal) |
#ifndef NDEBUG |
, m_hasBadParent(false) |
@@ -173,7 +173,7 @@ public: |
InlineBox* nextLeafChildIgnoringLineBreak() const; |
InlineBox* prevLeafChildIgnoringLineBreak() const; |
- RenderObject* renderer() const { return m_renderer; } |
+ RenderObject& renderer() const { return m_renderer; } |
InlineFlowBox* parent() const |
{ |
@@ -270,15 +270,15 @@ public: |
int expansion() const { return m_bitfields.expansion(); } |
- bool visibleToHitTestRequest(const HitTestRequest& request) const { return renderer()->visibleToHitTestRequest(request); } |
+ bool visibleToHitTestRequest(const HitTestRequest& request) const { return renderer().visibleToHitTestRequest(request); } |
- EVerticalAlign verticalAlign() const { return renderer()->style(m_bitfields.firstLine())->verticalAlign(); } |
+ EVerticalAlign verticalAlign() const { return renderer().style(m_bitfields.firstLine())->verticalAlign(); } |
// Use with caution! The type is not checked! |
RenderBoxModelObject* boxModelObject() const |
{ |
- if (!m_renderer->isText()) |
- return toRenderBoxModelObject(m_renderer); |
+ if (!renderer().isText()) |
+ return toRenderBoxModelObject(&renderer()); |
return 0; |
} |
@@ -398,12 +398,12 @@ protected: |
// For InlineFlowBox and InlineTextBox |
bool extracted() const { return m_bitfields.extracted(); } |
- RenderObject* m_renderer; |
- |
FloatPoint m_topLeft; |
float m_logicalWidth; |
private: |
+ RenderObject& m_renderer; |
+ |
InlineBoxBitfields m_bitfields; |
#ifndef NDEBUG |