Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / EllipsisBox.h

diff --git a/src/third_party/WebKit/Source/core/rendering/EllipsisBox.h b/src/third_party/WebKit/Source/core/rendering/EllipsisBox.h
index 9382e77..c8faf67 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/EllipsisBox.h
+++ b/src/third_party/WebKit/Source/core/rendering/EllipsisBox.h
@@ -22,33 +22,35 @@
 
 #include "core/rendering/InlineBox.h"
 
-namespace WebCore {
+namespace blink {
 
 class HitTestRequest;
 class HitTestResult;
 
 class EllipsisBox FINAL : public InlineBox {
 public:
-    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)
+    EllipsisBox(RenderObject& obj, const AtomicString& ellipsisStr, InlineFlowBox* parent,
+        int width, int height, int x, int y, bool firstLine, bool isVertical, InlineBox* markupBox)
+        : InlineBox(obj, FloatPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent)
         , m_shouldPaintMarkupBox(markupBox)
         , m_height(height)
         , m_str(ellipsisStr)
         , m_selectionState(RenderObject::SelectionNone)
     {
+        setHasVirtualLogicalHeight();
     }
 
-    virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom);
+    virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
     void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; }
     IntRect selectionRect();
 
+    virtual float virtualLogicalHeight() const OVERRIDE { return m_height; }
 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&);
+    int height() const { return m_height; }
+    virtual RenderObject::SelectionState selectionState() const OVERRIDE { return m_selectionState; }
+    void paintSelection(GraphicsContext*, const FloatPoint&, RenderStyle*, const Font&);
     InlineBox* markupBox() const;
 
     bool m_shouldPaintMarkupBox;
@@ -57,6 +59,6 @@ private:
     RenderObject::SelectionState m_selectionState;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // EllipsisBox_h