OLD | NEW |
---|---|
1 /** | 1 /** |
2 * Copyright (C) 2003, 2006 Apple Computer, Inc. | 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. |
3 * | 3 * |
4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
8 * | 8 * |
9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 22 matching lines...) Expand all Loading... | |
33 int width, int height, int x, int y, bool firstLine, bool isVertical, In lineBox* markupBox) | 33 int width, int height, int x, int y, bool firstLine, bool isVertical, In lineBox* markupBox) |
34 : InlineBox(obj, FloatPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent) | 34 : InlineBox(obj, FloatPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent) |
35 , m_shouldPaintMarkupBox(markupBox) | 35 , m_shouldPaintMarkupBox(markupBox) |
36 , m_height(height) | 36 , m_height(height) |
37 , m_str(ellipsisStr) | 37 , m_str(ellipsisStr) |
38 , m_selectionState(RenderObject::SelectionNone) | 38 , m_selectionState(RenderObject::SelectionNone) |
39 { | 39 { |
40 setHasVirtualLogicalHeight(); | 40 setHasVirtualLogicalHeight(); |
41 } | 41 } |
42 | 42 |
43 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, Layou tUnit lineBottom); | 43 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, Layou tUnit lineBottom) OVERRIDE; |
44 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE; | 44 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE; |
45 void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; } | 45 void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; } |
46 IntRect selectionRect(); | 46 IntRect selectionRect(); |
47 | 47 |
48 virtual float virtualLogicalHeight() const OVERRIDE { return m_height; } | 48 virtual float virtualLogicalHeight() const OVERRIDE { return m_height; } |
49 private: | 49 private: |
50 void paintMarkupBox(PaintInfo&, const LayoutPoint& paintOffset, LayoutUnit l ineTop, LayoutUnit lineBottom, RenderStyle*); | 50 void paintMarkupBox(PaintInfo&, const LayoutPoint& paintOffset, LayoutUnit l ineTop, LayoutUnit lineBottom, RenderStyle*); |
51 virtual int height() const { return m_height; } | 51 int height() const { return m_height; } |
eseidel
2014/01/10 20:11:50
Lineboxes no longer have virtual height?
Inactive
2014/01/10 20:29:06
height() is not virtual in LineBox class:
floa
| |
52 virtual RenderObject::SelectionState selectionState() { return m_selectionSt ate; } | 52 virtual RenderObject::SelectionState selectionState() OVERRIDE { return m_se lectionState; } |
53 void paintSelection(GraphicsContext*, const FloatPoint&, RenderStyle*, const Font&); | 53 void paintSelection(GraphicsContext*, const FloatPoint&, RenderStyle*, const Font&); |
54 InlineBox* markupBox() const; | 54 InlineBox* markupBox() const; |
55 | 55 |
56 bool m_shouldPaintMarkupBox; | 56 bool m_shouldPaintMarkupBox; |
57 int m_height; | 57 int m_height; |
58 AtomicString m_str; | 58 AtomicString m_str; |
59 RenderObject::SelectionState m_selectionState; | 59 RenderObject::SelectionState m_selectionState; |
60 }; | 60 }; |
61 | 61 |
62 } // namespace WebCore | 62 } // namespace WebCore |
63 | 63 |
64 #endif // EllipsisBox_h | 64 #endif // EllipsisBox_h |
OLD | NEW |