Merge 125635

Source/WebCore/rendering/EllipsisBox.h

Index: Source/WebCore/rendering/EllipsisBox.h
===================================================================
--- Source/WebCore/rendering/EllipsisBox.h	(revision 127625)
+++ Source/WebCore/rendering/EllipsisBox.h	(working copy)
@@ -32,9 +32,9 @@
     EllipsisBox(RenderObject* obj, const AtomicString& ellipsisStr, InlineFlowBox* parent,
                 int width, int height, int y, bool firstLine, bool isVertical, InlineBox* markupBox)
         : InlineBox(obj, FloatPoint(0, y), width, firstLine, true, false, false, isVertical, 0, 0, parent)
+        , m_shouldPaintMarkupBox(markupBox)
         , m_height(height)
         , m_str(ellipsisStr)
-        , m_markupBox(markupBox)
         , m_selectionState(RenderObject::SelectionNone)
     {
     }
@@ -45,13 +45,14 @@
     IntRect selectionRect();
 
 private:
+    void paintMarkupBox(PaintInfo&, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle*);
     virtual int height() const { return m_height; }
     virtual RenderObject::SelectionState selectionState() { return m_selectionState; }
     void paintSelection(GraphicsContext*, const LayoutPoint&, RenderStyle*, const Font&);
 
+    bool m_shouldPaintMarkupBox;
     int m_height;
     AtomicString m_str;
-    InlineBox* m_markupBox;
     RenderObject::SelectionState m_selectionState;
 };