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

Side by Side Diff: Source/core/rendering/RenderFlowThread.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/RenderFlexibleBox.h ('k') | Source/core/rendering/RenderFrame.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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // flow thread. It will also help in doing the layout. However, it will not rend er 50 // flow thread. It will also help in doing the layout. However, it will not rend er
51 // directly to screen. Instead, RenderRegion objects will redirect their paint 51 // directly to screen. Instead, RenderRegion objects will redirect their paint
52 // and nodeAtPoint methods to this object. Each RenderRegion will actually be a viewPort 52 // and nodeAtPoint methods to this object. Each RenderRegion will actually be a viewPort
53 // of the RenderFlowThread. 53 // of the RenderFlowThread.
54 54
55 class RenderFlowThread: public RenderBlockFlow { 55 class RenderFlowThread: public RenderBlockFlow {
56 public: 56 public:
57 RenderFlowThread(); 57 RenderFlowThread();
58 virtual ~RenderFlowThread() { }; 58 virtual ~RenderFlowThread() { };
59 59
60 virtual bool isRenderFlowThread() const OVERRIDE FINAL { return true; } 60 virtual bool isRenderFlowThread() const override final { return true; }
61 virtual bool isRenderMultiColumnFlowThread() const { return false; } 61 virtual bool isRenderMultiColumnFlowThread() const { return false; }
62 virtual bool isRenderPagedFlowThread() const { return false; } 62 virtual bool isRenderPagedFlowThread() const { return false; }
63 63
64 virtual void layout() OVERRIDE; 64 virtual void layout() override;
65 65
66 // Always create a RenderLayer for the RenderFlowThread so that we 66 // Always create a RenderLayer for the RenderFlowThread so that we
67 // can easily avoid drawing the children directly. 67 // can easily avoid drawing the children directly.
68 virtual LayerType layerTypeRequired() const OVERRIDE FINAL { return NormalLa yer; } 68 virtual LayerType layerTypeRequired() const override final { return NormalLa yer; }
69 69
70 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL; 70 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) override final;
71 71
72 virtual void addRegionToThread(RenderMultiColumnSet*) = 0; 72 virtual void addRegionToThread(RenderMultiColumnSet*) = 0;
73 virtual void removeRegionFromThread(RenderMultiColumnSet*); 73 virtual void removeRegionFromThread(RenderMultiColumnSet*);
74 74
75 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE; 75 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const override;
76 76
77 bool hasRegions() const { return m_multiColumnSetList.size(); } 77 bool hasRegions() const { return m_multiColumnSetList.size(); }
78 78
79 void validateRegions(); 79 void validateRegions();
80 void invalidateRegions(); 80 void invalidateRegions();
81 bool hasValidRegionInfo() const { return !m_regionsInvalidated && !m_multiCo lumnSetList.isEmpty(); } 81 bool hasValidRegionInfo() const { return !m_regionsInvalidated && !m_multiCo lumnSetList.isEmpty(); }
82 82
83 void paintInvalidationRectangleInRegions(const LayoutRect&) const; 83 void paintInvalidationRectangleInRegions(const LayoutRect&) const;
84 84
85 LayoutUnit pageLogicalHeightForOffset(LayoutUnit); 85 LayoutUnit pageLogicalHeightForOffset(LayoutUnit);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 }; 180 };
181 181
182 template <> struct ValueToString<RenderMultiColumnSet*> { 182 template <> struct ValueToString<RenderMultiColumnSet*> {
183 static String string(const RenderMultiColumnSet* value) { return String::for mat("%p", value); } 183 static String string(const RenderMultiColumnSet* value) { return String::for mat("%p", value); }
184 }; 184 };
185 #endif 185 #endif
186 186
187 } // namespace blink 187 } // namespace blink
188 188
189 #endif // RenderFlowThread_h 189 #endif // RenderFlowThread_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.h ('k') | Source/core/rendering/RenderFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698