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

Side by Side Diff: Source/core/rendering/RenderReplaced.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/RenderRegion.h ('k') | Source/core/rendering/RenderReplica.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 * Copyright (C) 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 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 14 matching lines...) Expand all
25 #include "core/rendering/RenderBox.h" 25 #include "core/rendering/RenderBox.h"
26 26
27 namespace blink { 27 namespace blink {
28 28
29 class RenderReplaced : public RenderBox { 29 class RenderReplaced : public RenderBox {
30 public: 30 public:
31 RenderReplaced(Element*); 31 RenderReplaced(Element*);
32 RenderReplaced(Element*, const LayoutSize& intrinsicSize); 32 RenderReplaced(Element*, const LayoutSize& intrinsicSize);
33 virtual ~RenderReplaced(); 33 virtual ~RenderReplaced();
34 34
35 virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred = Com puteActual) const OVERRIDE; 35 virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred = Com puteActual) const override;
36 virtual LayoutUnit computeReplacedLogicalHeight() const OVERRIDE; 36 virtual LayoutUnit computeReplacedLogicalHeight() const override;
37 37
38 bool hasReplacedLogicalHeight() const; 38 bool hasReplacedLogicalHeight() const;
39 LayoutRect replacedContentRect(const LayoutSize* overriddenIntrinsicSize = 0 ) const; 39 LayoutRect replacedContentRect(const LayoutSize* overriddenIntrinsicSize = 0 ) const;
40 40
41 virtual bool needsPreferredWidthsRecalculation() const OVERRIDE; 41 virtual bool needsPreferredWidthsRecalculation() const override;
42 42
43 // These values are specified to be 300 and 150 pixels in the CSS 2.1 spec. 43 // These values are specified to be 300 and 150 pixels in the CSS 2.1 spec.
44 // http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width 44 // http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width
45 static const int defaultWidth; 45 static const int defaultWidth;
46 static const int defaultHeight; 46 static const int defaultHeight;
47 virtual bool canHaveChildren() const OVERRIDE { return false; } 47 virtual bool canHaveChildren() const override { return false; }
48 bool shouldPaint(PaintInfo&, const LayoutPoint&); 48 bool shouldPaint(PaintInfo&, const LayoutPoint&);
49 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { } 49 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { }
50 LayoutRect localSelectionRect(bool checkWhetherSelected = true) const; // Th is is in local coordinates, but it's a physical rect (so the top left corner is physical top left). 50 LayoutRect localSelectionRect(bool checkWhetherSelected = true) const; // Th is is in local coordinates, but it's a physical rect (so the top left corner is physical top left).
51 51
52 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 52 virtual void paint(PaintInfo&, const LayoutPoint&) override;
53 53
54 protected: 54 protected:
55 virtual void willBeDestroyed() OVERRIDE; 55 virtual void willBeDestroyed() override;
56 56
57 virtual void layout() OVERRIDE; 57 virtual void layout() override;
58 58
59 virtual LayoutSize intrinsicSize() const OVERRIDE FINAL { return m_intrinsic Size; } 59 virtual LayoutSize intrinsicSize() const override final { return m_intrinsic Size; }
60 virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, doub le& intrinsicRatio) const OVERRIDE; 60 virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, doub le& intrinsicRatio) const override;
61 61
62 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE FINAL; 62 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const override final;
63 63
64 virtual LayoutUnit intrinsicContentLogicalHeight() const { return intrinsicL ogicalHeight(); } 64 virtual LayoutUnit intrinsicContentLogicalHeight() const { return intrinsicL ogicalHeight(); }
65 65
66 virtual LayoutUnit minimumReplacedHeight() const { return LayoutUnit(); } 66 virtual LayoutUnit minimumReplacedHeight() const { return LayoutUnit(); }
67 67
68 virtual void setSelectionState(SelectionState) OVERRIDE FINAL; 68 virtual void setSelectionState(SelectionState) override final;
69 69
70 bool isSelected() const; 70 bool isSelected() const;
71 71
72 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 72 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
73 73
74 void setIntrinsicSize(const LayoutSize& intrinsicSize) { m_intrinsicSize = i ntrinsicSize; } 74 void setIntrinsicSize(const LayoutSize& intrinsicSize) { m_intrinsicSize = i ntrinsicSize; }
75 virtual void intrinsicSizeChanged(); 75 virtual void intrinsicSizeChanged();
76 76
77 virtual RenderBox* embeddedContentBox() const { return 0; } 77 virtual RenderBox* embeddedContentBox() const { return 0; }
78 78
79 private: 79 private:
80 virtual const char* renderName() const OVERRIDE { return "RenderReplaced"; } 80 virtual const char* renderName() const override { return "RenderReplaced"; }
81 81
82 virtual void computePreferredLogicalWidths() OVERRIDE FINAL; 82 virtual void computePreferredLogicalWidths() override final;
83 83
84 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t OVERRIDE; 84 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t override;
85 85
86 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE F INAL; 86 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override f inal;
87 87
88 virtual bool canBeSelectionLeaf() const OVERRIDE { return true; } 88 virtual bool canBeSelectionLeaf() const override { return true; }
89 89
90 virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelO bject* paintInvalidationContainer) const OVERRIDE FINAL; 90 virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelO bject* paintInvalidationContainer) const override final;
91 void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constr ainedSize, double& intrinsicRatio) const; 91 void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constr ainedSize, double& intrinsicRatio) const;
92 92
93 mutable LayoutSize m_intrinsicSize; 93 mutable LayoutSize m_intrinsicSize;
94 }; 94 };
95 95
96 } 96 }
97 97
98 #endif 98 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderRegion.h ('k') | Source/core/rendering/RenderReplica.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698