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

Side by Side Diff: Source/core/rendering/RenderListItem.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/RenderListBox.h ('k') | Source/core/rendering/RenderListMarker.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 12 matching lines...) Expand all
23 #ifndef RenderListItem_h 23 #ifndef RenderListItem_h
24 #define RenderListItem_h 24 #define RenderListItem_h
25 25
26 #include "core/rendering/RenderBlockFlow.h" 26 #include "core/rendering/RenderBlockFlow.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 class HTMLOListElement; 30 class HTMLOListElement;
31 class RenderListMarker; 31 class RenderListMarker;
32 32
33 class RenderListItem FINAL : public RenderBlockFlow { 33 class RenderListItem final : public RenderBlockFlow {
34 public: 34 public:
35 explicit RenderListItem(Element*); 35 explicit RenderListItem(Element*);
36 virtual void trace(Visitor*) OVERRIDE; 36 virtual void trace(Visitor*) override;
37 37
38 int value() const { if (!m_isValueUpToDate) updateValueNow(); return m_value ; } 38 int value() const { if (!m_isValueUpToDate) updateValueNow(); return m_value ; }
39 void updateValue(); 39 void updateValue();
40 40
41 bool hasExplicitValue() const { return m_hasExplicitValue; } 41 bool hasExplicitValue() const { return m_hasExplicitValue; }
42 int explicitValue() const { return m_explicitValue; } 42 int explicitValue() const { return m_explicitValue; }
43 void setExplicitValue(int value); 43 void setExplicitValue(int value);
44 void clearExplicitValue(); 44 void clearExplicitValue();
45 45
46 void setNotInList(bool); 46 void setNotInList(bool);
47 bool notInList() const { return m_notInList; } 47 bool notInList() const { return m_notInList; }
48 48
49 const String& markerText() const; 49 const String& markerText() const;
50 50
51 void updateListMarkerNumbers(); 51 void updateListMarkerNumbers();
52 52
53 static void updateItemValuesForOrderedList(const HTMLOListElement*); 53 static void updateItemValuesForOrderedList(const HTMLOListElement*);
54 static unsigned itemCountForOrderedList(const HTMLOListElement*); 54 static unsigned itemCountForOrderedList(const HTMLOListElement*);
55 55
56 bool isEmpty() const; 56 bool isEmpty() const;
57 57
58 private: 58 private:
59 virtual const char* renderName() const OVERRIDE { return "RenderListItem"; } 59 virtual const char* renderName() const override { return "RenderListItem"; }
60 60
61 virtual bool isListItem() const OVERRIDE { return true; } 61 virtual bool isListItem() const override { return true; }
62 62
63 virtual void willBeDestroyed() OVERRIDE; 63 virtual void willBeDestroyed() override;
64 64
65 virtual void insertedIntoTree() OVERRIDE; 65 virtual void insertedIntoTree() override;
66 virtual void willBeRemovedFromTree() OVERRIDE; 66 virtual void willBeRemovedFromTree() override;
67 67
68 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 68 virtual void paint(PaintInfo&, const LayoutPoint&) override;
69 69
70 virtual void layout() OVERRIDE; 70 virtual void layout() override;
71 71
72 // Returns true if we re-attached and updated the location of the marker. 72 // Returns true if we re-attached and updated the location of the marker.
73 bool updateMarkerLocation(); 73 bool updateMarkerLocation();
74 void updateMarkerLocationAndInvalidateWidth(); 74 void updateMarkerLocationAndInvalidateWidth();
75 75
76 void positionListMarker(); 76 void positionListMarker();
77 77
78 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 78 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
79 79
80 virtual void addOverflowFromChildren() OVERRIDE; 80 virtual void addOverflowFromChildren() override;
81 81
82 inline int calcValue() const; 82 inline int calcValue() const;
83 void updateValueNow() const; 83 void updateValueNow() const;
84 void explicitValueChanged(); 84 void explicitValueChanged();
85 85
86 int m_explicitValue; 86 int m_explicitValue;
87 RawPtrWillBeMember<RenderListMarker> m_marker; 87 RawPtrWillBeMember<RenderListMarker> m_marker;
88 mutable int m_value; 88 mutable int m_value;
89 89
90 bool m_hasExplicitValue : 1; 90 bool m_hasExplicitValue : 1;
91 mutable bool m_isValueUpToDate : 1; 91 mutable bool m_isValueUpToDate : 1;
92 bool m_notInList : 1; 92 bool m_notInList : 1;
93 }; 93 };
94 94
95 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListItem, isListItem()); 95 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListItem, isListItem());
96 96
97 } // namespace blink 97 } // namespace blink
98 98
99 #endif // RenderListItem_h 99 #endif // RenderListItem_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListBox.h ('k') | Source/core/rendering/RenderListMarker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698