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

Side by Side Diff: Source/core/rendering/RenderListMarker.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/RenderListItem.h ('k') | Source/core/rendering/RenderMarquee.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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 const String& text() const { return m_text; } 42 const String& text() const { return m_text; }
43 String suffix() const; 43 String suffix() const;
44 44
45 bool isInside() const; 45 bool isInside() const;
46 46
47 void updateMarginsAndContent(); 47 void updateMarginsAndContent();
48 48
49 private: 49 private:
50 RenderListMarker(RenderListItem*); 50 RenderListMarker(RenderListItem*);
51 51
52 virtual const char* renderName() const { return "RenderListMarker"; } 52 virtual const char* renderName() const OVERRIDE { return "RenderListMarker"; }
53 virtual void computePreferredLogicalWidths() OVERRIDE; 53 virtual void computePreferredLogicalWidths() OVERRIDE;
54 54
55 virtual bool isListMarker() const { return true; } 55 virtual bool isListMarker() const OVERRIDE { return true; }
56 56
57 virtual void paint(PaintInfo&, const LayoutPoint&); 57 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
58 58
59 virtual void layout(); 59 virtual void layout() OVERRIDE;
60 60
61 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); 61 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;
62 62
63 virtual InlineBox* createInlineBox(); 63 virtual InlineBox* createInlineBox() OVERRIDE;
64 64
65 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const; 65 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const OVERRIDE;
66 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const; 66 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE;
67 67
68 bool isImage() const; 68 bool isImage() const;
69 bool isText() const { return !isImage(); } 69 bool isText() const { return !isImage(); }
70 70
71 virtual void setSelectionState(SelectionState); 71 virtual void setSelectionState(SelectionState) OVERRIDE;
72 virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* rep aintContainer, bool clipToVisibleContent = true) OVERRIDE; 72 virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* rep aintContainer, bool clipToVisibleContent = true) OVERRIDE;
73 virtual bool canBeSelectionLeaf() const { return true; } 73 virtual bool canBeSelectionLeaf() const OVERRIDE { return true; }
74 74
75 void updateMargins(); 75 void updateMargins();
76 void updateContent(); 76 void updateContent();
77 77
78 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); 78 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) O VERRIDE;
79 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 79 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
80 80
81 IntRect getRelativeMarkerRect(); 81 IntRect getRelativeMarkerRect();
82 LayoutRect localSelectionRect(); 82 LayoutRect localSelectionRect();
83 83
84 String m_text; 84 String m_text;
85 RefPtr<StyleImage> m_image; 85 RefPtr<StyleImage> m_image;
86 RenderListItem* m_listItem; 86 RenderListItem* m_listItem;
87 }; 87 };
88 88
89 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListMarker, isListMarker()); 89 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListMarker, isListMarker());
90 90
91 } // namespace WebCore 91 } // namespace WebCore
92 92
93 #endif // RenderListMarker_h 93 #endif // RenderListMarker_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListItem.h ('k') | Source/core/rendering/RenderMarquee.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698