Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: Source/core/rendering/EllipsisBox.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/rendering/ClipPathOperation.h ('k') | Source/core/rendering/FilterEffectRenderer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #ifndef EllipsisBox_h 20 #ifndef EllipsisBox_h
21 #define EllipsisBox_h 21 #define EllipsisBox_h
22 22
23 #include "core/rendering/InlineBox.h" 23 #include "core/rendering/InlineBox.h"
24 24
25 namespace blink { 25 namespace blink {
26 26
27 class HitTestRequest; 27 class HitTestRequest;
28 class HitTestResult; 28 class HitTestResult;
29 29
30 class EllipsisBox FINAL : public InlineBox { 30 class EllipsisBox final : public InlineBox {
31 public: 31 public:
32 EllipsisBox(RenderObject& obj, const AtomicString& ellipsisStr, InlineFlowBo x* parent, 32 EllipsisBox(RenderObject& obj, const AtomicString& ellipsisStr, InlineFlowBo x* parent,
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) OVERRIDE; 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 virtual RenderObject::SelectionState selectionState() const OVERRIDE { retur n m_selectionState; } 49 virtual RenderObject::SelectionState selectionState() const override { retur n m_selectionState; }
50 const AtomicString& ellipsisStr() { return m_str; } 50 const AtomicString& ellipsisStr() { return m_str; }
51 InlineBox* markupBox() const; 51 InlineBox* markupBox() const;
52 52
53 private: 53 private:
54 54
55 bool m_shouldPaintMarkupBox; 55 bool m_shouldPaintMarkupBox;
56 int m_height; 56 int m_height;
57 AtomicString m_str; 57 AtomicString m_str;
58 RenderObject::SelectionState m_selectionState; 58 RenderObject::SelectionState m_selectionState;
59 }; 59 };
60 60
61 } // namespace blink 61 } // namespace blink
62 62
63 #endif // EllipsisBox_h 63 #endif // EllipsisBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/ClipPathOperation.h ('k') | Source/core/rendering/FilterEffectRenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698