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

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

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 const String& markerText() const; 48 const String& markerText() const;
49 String markerTextWithSuffix() const; 49 String markerTextWithSuffix() const;
50 50
51 void updateListMarkerNumbers(); 51 void updateListMarkerNumbers();
52 void updateMarkerLocation(); 52 void updateMarkerLocation();
53 53
54 static void updateItemValuesForOrderedList(const HTMLOListElement*); 54 static void updateItemValuesForOrderedList(const HTMLOListElement*);
55 static unsigned itemCountForOrderedList(const HTMLOListElement*); 55 static unsigned itemCountForOrderedList(const HTMLOListElement*);
56 56
57 private: 57 private:
58 virtual const char* renderName() const { return "RenderListItem"; } 58 virtual const char* renderName() const OVERRIDE { return "RenderListItem"; }
59 59
60 virtual bool isListItem() const { return true; } 60 virtual bool isListItem() const OVERRIDE { return true; }
61 61
62 virtual void willBeDestroyed(); 62 virtual void willBeDestroyed() OVERRIDE;
63 63
64 virtual void insertedIntoTree() OVERRIDE; 64 virtual void insertedIntoTree() OVERRIDE;
65 virtual void willBeRemovedFromTree() OVERRIDE; 65 virtual void willBeRemovedFromTree() OVERRIDE;
66 66
67 virtual bool isEmpty() const; 67 virtual bool isEmpty() const OVERRIDE;
68 virtual void paint(PaintInfo&, const LayoutPoint&); 68 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
69 69
70 virtual void layout(); 70 virtual void layout() OVERRIDE;
71 71
72 virtual bool supportsPartialLayout() const OVERRIDE { return false; } 72 virtual bool supportsPartialLayout() const OVERRIDE { return false; }
73 73
74 void positionListMarker(); 74 void positionListMarker();
75 75
76 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 76 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
77 77
78 virtual void addOverflowFromChildren(); 78 virtual void addOverflowFromChildren() OVERRIDE;
79 79
80 inline int calcValue() const; 80 inline int calcValue() const;
81 void updateValueNow() const; 81 void updateValueNow() const;
82 void explicitValueChanged(); 82 void explicitValueChanged();
83 83
84 int m_explicitValue; 84 int m_explicitValue;
85 RenderListMarker* m_marker; 85 RenderListMarker* m_marker;
86 mutable int m_value; 86 mutable int m_value;
87 87
88 bool m_hasExplicitValue : 1; 88 bool m_hasExplicitValue : 1;
89 mutable bool m_isValueUpToDate : 1; 89 mutable bool m_isValueUpToDate : 1;
90 bool m_notInList : 1; 90 bool m_notInList : 1;
91 }; 91 };
92 92
93 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListItem, isListItem()); 93 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListItem, isListItem());
94 94
95 } // namespace WebCore 95 } // namespace WebCore
96 96
97 #endif // RenderListItem_h 97 #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