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

Side by Side Diff: Source/core/layout/LayoutListItem.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutListBox.h ('k') | Source/core/layout/LayoutListMarker.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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 void updateListMarkerNumbers(); 56 void updateListMarkerNumbers();
57 57
58 static void updateItemValuesForOrderedList(const HTMLOListElement*); 58 static void updateItemValuesForOrderedList(const HTMLOListElement*);
59 static unsigned itemCountForOrderedList(const HTMLOListElement*); 59 static unsigned itemCountForOrderedList(const HTMLOListElement*);
60 60
61 bool isEmpty() const; 61 bool isEmpty() const;
62 62
63 LayoutListMarker* marker() const { return m_marker; } 63 LayoutListMarker* marker() const { return m_marker; }
64 64
65 virtual const char* name() const override { return "LayoutListItem"; } 65 const char* name() const override { return "LayoutListItem"; }
66 66
67 private: 67 private:
68 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectListItem || LayoutBlockFlow::isOfType(type); } 68 bool isOfType(LayoutObjectType type) const override { return type == LayoutO bjectListItem || LayoutBlockFlow::isOfType(type); }
69 69
70 virtual void willBeDestroyed() override; 70 void willBeDestroyed() override;
71 71
72 virtual void insertedIntoTree() override; 72 void insertedIntoTree() override;
73 virtual void willBeRemovedFromTree() override; 73 void willBeRemovedFromTree() override;
74 74
75 virtual void paint(const PaintInfo&, const LayoutPoint&) override; 75 void paint(const PaintInfo&, const LayoutPoint&) override;
76 76
77 virtual void subtreeDidChange() final; 77 void subtreeDidChange() final;
78 78
79 // Returns true if we re-attached and updated the location of the marker. 79 // Returns true if we re-attached and updated the location of the marker.
80 bool updateMarkerLocation(); 80 bool updateMarkerLocation();
81 81
82 void positionListMarker(); 82 void positionListMarker();
83 83
84 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override; 84 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override ;
85 85
86 virtual void addOverflowFromChildren() override; 86 void addOverflowFromChildren() override;
87 87
88 inline int calcValue() const; 88 inline int calcValue() const;
89 void updateValueNow() const; 89 void updateValueNow() const;
90 void explicitValueChanged(); 90 void explicitValueChanged();
91 91
92 int m_explicitValue; 92 int m_explicitValue;
93 LayoutListMarker* m_marker; 93 LayoutListMarker* m_marker;
94 mutable int m_value; 94 mutable int m_value;
95 95
96 bool m_hasExplicitValue : 1; 96 bool m_hasExplicitValue : 1;
97 mutable bool m_isValueUpToDate : 1; 97 mutable bool m_isValueUpToDate : 1;
98 bool m_notInList : 1; 98 bool m_notInList : 1;
99 }; 99 };
100 100
101 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListItem, isListItem()); 101 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListItem, isListItem());
102 102
103 } // namespace blink 103 } // namespace blink
104 104
105 #endif // LayoutListItem_h 105 #endif // LayoutListItem_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutListBox.h ('k') | Source/core/layout/LayoutListMarker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698