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

Side by Side Diff: Source/core/rendering/RenderDeprecatedFlexibleBox.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/RenderCounter.h ('k') | Source/core/rendering/RenderDetailsMarker.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 * This file is part of the render object implementation for KHTML. 2 * This file is part of the render object implementation for KHTML.
3 * 3 *
4 * Copyright (C) 2003 Apple Computer, Inc. 4 * Copyright (C) 2003 Apple Computer, Inc.
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 11 matching lines...) Expand all
22 22
23 #ifndef RenderDeprecatedFlexibleBox_h 23 #ifndef RenderDeprecatedFlexibleBox_h
24 #define RenderDeprecatedFlexibleBox_h 24 #define RenderDeprecatedFlexibleBox_h
25 25
26 #include "core/rendering/RenderBlock.h" 26 #include "core/rendering/RenderBlock.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 class FlexBoxIterator; 30 class FlexBoxIterator;
31 31
32 class RenderDeprecatedFlexibleBox FINAL : public RenderBlock { 32 class RenderDeprecatedFlexibleBox final : public RenderBlock {
33 public: 33 public:
34 RenderDeprecatedFlexibleBox(Element&); 34 RenderDeprecatedFlexibleBox(Element&);
35 virtual ~RenderDeprecatedFlexibleBox(); 35 virtual ~RenderDeprecatedFlexibleBox();
36 36
37 virtual const char* renderName() const OVERRIDE; 37 virtual const char* renderName() const override;
38 38
39 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) O VERRIDE; 39 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) o verride;
40 40
41 virtual void layoutBlock(bool relayoutChildren) OVERRIDE; 41 virtual void layoutBlock(bool relayoutChildren) override;
42 void layoutHorizontalBox(bool relayoutChildren); 42 void layoutHorizontalBox(bool relayoutChildren);
43 void layoutVerticalBox(bool relayoutChildren); 43 void layoutVerticalBox(bool relayoutChildren);
44 44
45 virtual bool isDeprecatedFlexibleBox() const OVERRIDE { return true; } 45 virtual bool isDeprecatedFlexibleBox() const override { return true; }
46 bool isStretchingChildren() const { return m_stretchingChildren; } 46 bool isStretchingChildren() const { return m_stretchingChildren; }
47 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; } 47 virtual bool canCollapseAnonymousBlockChild() const override { return false; }
48 48
49 void placeChild(RenderBox* child, const LayoutPoint& location); 49 void placeChild(RenderBox* child, const LayoutPoint& location);
50 50
51 private: 51 private:
52 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 52 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const override;
53 53
54 LayoutUnit allowedChildFlex(RenderBox* child, bool expanding, unsigned group ); 54 LayoutUnit allowedChildFlex(RenderBox* child, bool expanding, unsigned group );
55 55
56 bool hasMultipleLines() const { return style()->boxLines() == MULTIPLE; } 56 bool hasMultipleLines() const { return style()->boxLines() == MULTIPLE; }
57 bool isVertical() const { return style()->boxOrient() == VERTICAL; } 57 bool isVertical() const { return style()->boxOrient() == VERTICAL; }
58 bool isHorizontal() const { return style()->boxOrient() == HORIZONTAL; } 58 bool isHorizontal() const { return style()->boxOrient() == HORIZONTAL; }
59 59
60 void applyLineClamp(FlexBoxIterator&, bool relayoutChildren); 60 void applyLineClamp(FlexBoxIterator&, bool relayoutChildren);
61 void clearLineClamp(); 61 void clearLineClamp();
62 62
63 bool m_stretchingChildren; 63 bool m_stretchingChildren;
64 }; 64 };
65 65
66 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderDeprecatedFlexibleBox, isDeprecatedFlexibl eBox()); 66 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderDeprecatedFlexibleBox, isDeprecatedFlexibl eBox());
67 67
68 } // namespace blink 68 } // namespace blink
69 69
70 #endif // RenderDeprecatedFlexibleBox_h 70 #endif // RenderDeprecatedFlexibleBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderCounter.h ('k') | Source/core/rendering/RenderDetailsMarker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698