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

Side by Side Diff: Source/core/rendering/svg/SVGRootInlineBox.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) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
3 * Copyright (C) 2006 Apple Computer Inc. 3 * Copyright (C) 2006 Apple Computer Inc.
4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2010. 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 11 matching lines...) Expand all
22 22
23 #ifndef SVGRootInlineBox_h 23 #ifndef SVGRootInlineBox_h
24 #define SVGRootInlineBox_h 24 #define SVGRootInlineBox_h
25 25
26 #include "core/rendering/RootInlineBox.h" 26 #include "core/rendering/RootInlineBox.h"
27 #include "core/rendering/svg/SVGRenderSupport.h" 27 #include "core/rendering/svg/SVGRenderSupport.h"
28 #include "core/rendering/svg/SVGTextLayoutEngine.h" 28 #include "core/rendering/svg/SVGTextLayoutEngine.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 class SVGRootInlineBox FINAL : public RootInlineBox { 32 class SVGRootInlineBox final : public RootInlineBox {
33 public: 33 public:
34 SVGRootInlineBox(RenderBlockFlow& block) 34 SVGRootInlineBox(RenderBlockFlow& block)
35 : RootInlineBox(block) 35 : RootInlineBox(block)
36 , m_logicalHeight(0) 36 , m_logicalHeight(0)
37 { 37 {
38 } 38 }
39 39
40 virtual bool isSVGRootInlineBox() const OVERRIDE { return true; } 40 virtual bool isSVGRootInlineBox() const override { return true; }
41 41
42 virtual float virtualLogicalHeight() const OVERRIDE { return m_logicalHeight ; } 42 virtual float virtualLogicalHeight() const override { return m_logicalHeight ; }
43 void setLogicalHeight(float height) { m_logicalHeight = height; } 43 void setLogicalHeight(float height) { m_logicalHeight = height; }
44 44
45 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, Layou tUnit lineBottom) OVERRIDE; 45 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, Layou tUnit lineBottom) override;
46 46
47 virtual void markDirty() OVERRIDE; 47 virtual void markDirty() override;
48 48
49 void computePerCharacterLayoutInformation(); 49 void computePerCharacterLayoutInformation();
50 50
51 InlineBox* closestLeafChildForPosition(const LayoutPoint&); 51 InlineBox* closestLeafChildForPosition(const LayoutPoint&);
52 52
53 private: 53 private:
54 void reorderValueLists(Vector<SVGTextLayoutAttributes*>&); 54 void reorderValueLists(Vector<SVGTextLayoutAttributes*>&);
55 void layoutCharactersInTextBoxes(InlineFlowBox*, SVGTextLayoutEngine&); 55 void layoutCharactersInTextBoxes(InlineFlowBox*, SVGTextLayoutEngine&);
56 void layoutChildBoxes(InlineFlowBox*, FloatRect* = 0); 56 void layoutChildBoxes(InlineFlowBox*, FloatRect* = 0);
57 void layoutRootBox(const FloatRect&); 57 void layoutRootBox(const FloatRect&);
58 58
59 private: 59 private:
60 float m_logicalHeight; 60 float m_logicalHeight;
61 }; 61 };
62 62
63 DEFINE_INLINE_BOX_TYPE_CASTS(SVGRootInlineBox); 63 DEFINE_INLINE_BOX_TYPE_CASTS(SVGRootInlineBox);
64 64
65 } // namespace blink 65 } // namespace blink
66 66
67 #endif // SVGRootInlineBox_h 67 #endif // SVGRootInlineBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/SVGInlineTextBox.h ('k') | Source/core/rendering/svg/SVGTextRunRenderingContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698