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

Side by Side Diff: Source/core/rendering/RenderFrameSet.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/RenderFrame.h ('k') | Source/core/rendering/RenderFullScreen.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) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 bool allowBorder(FrameEdge edge) const { return m_allowBorder[edge]; } 46 bool allowBorder(FrameEdge edge) const { return m_allowBorder[edge]; }
47 47
48 void setPreventResize(FrameEdge edge, bool preventResize) { m_preventResize[ edge] = preventResize; } 48 void setPreventResize(FrameEdge edge, bool preventResize) { m_preventResize[ edge] = preventResize; }
49 void setAllowBorder(FrameEdge edge, bool allowBorder) { m_allowBorder[edge] = allowBorder; } 49 void setAllowBorder(FrameEdge edge, bool allowBorder) { m_allowBorder[edge] = allowBorder; }
50 50
51 private: 51 private:
52 Vector<bool> m_preventResize; 52 Vector<bool> m_preventResize;
53 Vector<bool> m_allowBorder; 53 Vector<bool> m_allowBorder;
54 }; 54 };
55 55
56 class RenderFrameSet FINAL : public RenderBox { 56 class RenderFrameSet final : public RenderBox {
57 public: 57 public:
58 RenderFrameSet(HTMLFrameSetElement*); 58 RenderFrameSet(HTMLFrameSetElement*);
59 virtual ~RenderFrameSet(); 59 virtual ~RenderFrameSet();
60 virtual void trace(Visitor*) OVERRIDE; 60 virtual void trace(Visitor*) override;
61 61
62 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); } 62 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
63 RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); r eturn children()->lastChild(); } 63 RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); r eturn children()->lastChild(); }
64 64
65 // If you have a RenderFrameSet, use firstChild or lastChild instead. 65 // If you have a RenderFrameSet, use firstChild or lastChild instead.
66 void slowFirstChild() const WTF_DELETED_FUNCTION; 66 void slowFirstChild() const WTF_DELETED_FUNCTION;
67 void slowLastChild() const WTF_DELETED_FUNCTION; 67 void slowLastChild() const WTF_DELETED_FUNCTION;
68 68
69 const RenderObjectChildList* children() const { return &m_children; } 69 const RenderObjectChildList* children() const { return &m_children; }
70 RenderObjectChildList* children() { return &m_children; } 70 RenderObjectChildList* children() { return &m_children; }
(...skipping 17 matching lines...) Expand all
88 void resize(int); 88 void resize(int);
89 89
90 Vector<int> m_sizes; 90 Vector<int> m_sizes;
91 Vector<int> m_deltas; 91 Vector<int> m_deltas;
92 Vector<bool> m_preventResize; 92 Vector<bool> m_preventResize;
93 Vector<bool> m_allowBorder; 93 Vector<bool> m_allowBorder;
94 int m_splitBeingResized; 94 int m_splitBeingResized;
95 int m_splitResizeOffset; 95 int m_splitResizeOffset;
96 }; 96 };
97 97
98 virtual RenderObjectChildList* virtualChildren() OVERRIDE { return children( ); } 98 virtual RenderObjectChildList* virtualChildren() override { return children( ); }
99 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE { retu rn children(); } 99 virtual const RenderObjectChildList* virtualChildren() const override { retu rn children(); }
100 100
101 virtual const char* renderName() const OVERRIDE { return "RenderFrameSet"; } 101 virtual const char* renderName() const override { return "RenderFrameSet"; }
102 virtual bool isFrameSet() const OVERRIDE { return true; } 102 virtual bool isFrameSet() const override { return true; }
103 103
104 virtual void layout() OVERRIDE; 104 virtual void layout() override;
105 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 105 virtual void paint(PaintInfo&, const LayoutPoint&) override;
106 virtual void computePreferredLogicalWidths() OVERRIDE; 106 virtual void computePreferredLogicalWidths() override;
107 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE; 107 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
108 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRID E; 108 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const overrid e;
109 109
110 inline HTMLFrameSetElement* frameSet() const; 110 inline HTMLFrameSetElement* frameSet() const;
111 111
112 void setIsResizing(bool); 112 void setIsResizing(bool);
113 113
114 void layOutAxis(GridAxis&, const Vector<HTMLDimension>&, int availableSpace) ; 114 void layOutAxis(GridAxis&, const Vector<HTMLDimension>&, int availableSpace) ;
115 void computeEdgeInfo(); 115 void computeEdgeInfo();
116 void fillFromEdgeInfo(const FrameEdgeInfo& edgeInfo, int r, int c); 116 void fillFromEdgeInfo(const FrameEdgeInfo& edgeInfo, int r, int c);
117 void positionFrames(); 117 void positionFrames();
118 118
(...skipping 13 matching lines...) Expand all
132 132
133 bool m_isResizing; 133 bool m_isResizing;
134 bool m_isChildResizing; 134 bool m_isChildResizing;
135 }; 135 };
136 136
137 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFrameSet, isFrameSet()); 137 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFrameSet, isFrameSet());
138 138
139 } // namespace blink 139 } // namespace blink
140 140
141 #endif // RenderFrameSet_h 141 #endif // RenderFrameSet_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFrame.h ('k') | Source/core/rendering/RenderFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698