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

Side by Side Diff: Source/core/rendering/RenderCounter.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 2 * Copyright (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
3 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 11 matching lines...) Expand all
22 #ifndef RenderCounter_h 22 #ifndef RenderCounter_h
23 #define RenderCounter_h 23 #define RenderCounter_h
24 24
25 #include "core/rendering/RenderText.h" 25 #include "core/rendering/RenderText.h"
26 #include "core/rendering/style/CounterContent.h" 26 #include "core/rendering/style/CounterContent.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 class CounterNode; 30 class CounterNode;
31 31
32 class RenderCounter FINAL : public RenderText { 32 class RenderCounter final : public RenderText {
33 public: 33 public:
34 RenderCounter(Document*, const CounterContent&); 34 RenderCounter(Document*, const CounterContent&);
35 virtual ~RenderCounter(); 35 virtual ~RenderCounter();
36 virtual void destroy() OVERRIDE; 36 virtual void destroy() override;
37 37
38 static void destroyCounterNodes(RenderObject&); 38 static void destroyCounterNodes(RenderObject&);
39 static void destroyCounterNode(RenderObject&, const AtomicString& identifier ); 39 static void destroyCounterNode(RenderObject&, const AtomicString& identifier );
40 static void rendererSubtreeAttached(RenderObject*); 40 static void rendererSubtreeAttached(RenderObject*);
41 static void rendererRemovedFromTree(RenderObject*); 41 static void rendererRemovedFromTree(RenderObject*);
42 static void rendererStyleChanged(RenderObject&, const RenderStyle* oldStyle, const RenderStyle* newStyle); 42 static void rendererStyleChanged(RenderObject&, const RenderStyle* oldStyle, const RenderStyle* newStyle);
43 43
44 void updateCounter(); 44 void updateCounter();
45 45
46 protected: 46 protected:
47 virtual void willBeDestroyed() OVERRIDE; 47 virtual void willBeDestroyed() override;
48 48
49 private: 49 private:
50 virtual const char* renderName() const OVERRIDE; 50 virtual const char* renderName() const override;
51 virtual bool isCounter() const OVERRIDE; 51 virtual bool isCounter() const override;
52 virtual PassRefPtr<StringImpl> originalText() const OVERRIDE; 52 virtual PassRefPtr<StringImpl> originalText() const override;
53 53
54 // Removes the reference to the CounterNode associated with this renderer. 54 // Removes the reference to the CounterNode associated with this renderer.
55 // This is used to cause a counter display update when the CounterNode tree changes. 55 // This is used to cause a counter display update when the CounterNode tree changes.
56 void invalidate(); 56 void invalidate();
57 57
58 CounterContent m_counter; 58 CounterContent m_counter;
59 CounterNode* m_counterNode; 59 CounterNode* m_counterNode;
60 RenderCounter* m_nextForSameCounter; 60 RenderCounter* m_nextForSameCounter;
61 friend class CounterNode; 61 friend class CounterNode;
62 }; 62 };
63 63
64 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderCounter, isCounter()); 64 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderCounter, isCounter());
65 65
66 } // namespace blink 66 } // namespace blink
67 67
68 #ifndef NDEBUG 68 #ifndef NDEBUG
69 // Outside the WebCore namespace for ease of invocation from gdb. 69 // Outside the WebCore namespace for ease of invocation from gdb.
70 void showCounterRendererTree(const blink::RenderObject*, const char* counterName = 0); 70 void showCounterRendererTree(const blink::RenderObject*, const char* counterName = 0);
71 #endif 71 #endif
72 72
73 #endif // RenderCounter_h 73 #endif // RenderCounter_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderCombineText.h ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698