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

Side by Side Diff: Source/core/html/HTMLFrameSetElement.h

Issue 635793002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/html/HTMLFrameOwnerElement.h ('k') | Source/core/html/HTMLHRElement.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 * (C) 2000 Simon Hausmann <hausmann@kde.org> 4 * (C) 2000 Simon Hausmann <hausmann@kde.org>
5 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 12 matching lines...) Expand all
23 23
24 #ifndef HTMLFrameSetElement_h 24 #ifndef HTMLFrameSetElement_h
25 #define HTMLFrameSetElement_h 25 #define HTMLFrameSetElement_h
26 26
27 #include "core/dom/Document.h" 27 #include "core/dom/Document.h"
28 #include "core/html/HTMLDimension.h" 28 #include "core/html/HTMLDimension.h"
29 #include "core/html/HTMLElement.h" 29 #include "core/html/HTMLElement.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class HTMLFrameSetElement FINAL : public HTMLElement { 33 class HTMLFrameSetElement final : public HTMLElement {
34 DEFINE_WRAPPERTYPEINFO(); 34 DEFINE_WRAPPERTYPEINFO();
35 public: 35 public:
36 DECLARE_NODE_FACTORY(HTMLFrameSetElement); 36 DECLARE_NODE_FACTORY(HTMLFrameSetElement);
37 37
38 bool hasFrameBorder() const { return m_frameborder; } 38 bool hasFrameBorder() const { return m_frameborder; }
39 bool noResize() const { return m_noresize; } 39 bool noResize() const { return m_noresize; }
40 40
41 size_t totalRows() const { return std::max<size_t>(1, m_rowLengths.size()); } 41 size_t totalRows() const { return std::max<size_t>(1, m_rowLengths.size()); }
42 size_t totalCols() const { return std::max<size_t>(1, m_colLengths.size()); } 42 size_t totalCols() const { return std::max<size_t>(1, m_colLengths.size()); }
43 int border() const { return hasFrameBorder() ? m_border : 0; } 43 int border() const { return hasFrameBorder() ? m_border : 0; }
44 44
45 bool hasBorderColor() const { return m_borderColorSet; } 45 bool hasBorderColor() const { return m_borderColorSet; }
46 46
47 const Vector<HTMLDimension>& rowLengths() const { return m_rowLengths; } 47 const Vector<HTMLDimension>& rowLengths() const { return m_rowLengths; }
48 const Vector<HTMLDimension>& colLengths() const { return m_colLengths; } 48 const Vector<HTMLDimension>& colLengths() const { return m_colLengths; }
49 49
50 LocalDOMWindow* anonymousNamedGetter(const AtomicString&); 50 LocalDOMWindow* anonymousNamedGetter(const AtomicString&);
51 51
52 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(blur); 52 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(blur);
53 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(error); 53 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(error);
54 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(focus); 54 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(focus);
55 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(load); 55 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(load);
56 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(resize); 56 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(resize);
57 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(scroll); 57 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(scroll);
58 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(orientationchange); 58 DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(orientationchange);
59 59
60 private: 60 private:
61 explicit HTMLFrameSetElement(Document&); 61 explicit HTMLFrameSetElement(Document&);
62 62
63 virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERR IDE; 63 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide;
64 virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE; 64 virtual bool isPresentationAttribute(const QualifiedName&) const override;
65 virtual void collectStyleForPresentationAttribute(const QualifiedName&, cons t AtomicString&, MutableStylePropertySet*) OVERRIDE; 65 virtual void collectStyleForPresentationAttribute(const QualifiedName&, cons t AtomicString&, MutableStylePropertySet*) override;
66 66
67 virtual void attach(const AttachContext& = AttachContext()) OVERRIDE; 67 virtual void attach(const AttachContext& = AttachContext()) override;
68 virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE; 68 virtual bool rendererIsNeeded(const RenderStyle&) override;
69 virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE; 69 virtual RenderObject* createRenderer(RenderStyle*) override;
70 70
71 virtual void defaultEventHandler(Event*) OVERRIDE; 71 virtual void defaultEventHandler(Event*) override;
72 72
73 virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE; 73 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
74 virtual void willRecalcStyle(StyleRecalcChange) OVERRIDE; 74 virtual void willRecalcStyle(StyleRecalcChange) override;
75 75
76 Vector<HTMLDimension> m_rowLengths; 76 Vector<HTMLDimension> m_rowLengths;
77 Vector<HTMLDimension> m_colLengths; 77 Vector<HTMLDimension> m_colLengths;
78 78
79 int m_border; 79 int m_border;
80 bool m_borderSet; 80 bool m_borderSet;
81 81
82 bool m_borderColorSet; 82 bool m_borderColorSet;
83 83
84 bool m_frameborder; 84 bool m_frameborder;
85 bool m_frameborderSet; 85 bool m_frameborderSet;
86 bool m_noresize; 86 bool m_noresize;
87 }; 87 };
88 88
89 } // namespace blink 89 } // namespace blink
90 90
91 #endif // HTMLFrameSetElement_h 91 #endif // HTMLFrameSetElement_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameOwnerElement.h ('k') | Source/core/html/HTMLHRElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698