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

Side by Side Diff: Source/core/layout/svg/SVGTextLayoutAttributesBuilder.h

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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/layout/svg/SVGResources.h ('k') | Source/core/layout/svg/SVGTextLayoutEngine.cpp » ('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) Research In Motion Limited 2010-2012. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void buildLayoutAttributesForText(LayoutSVGInlineText*); 47 void buildLayoutAttributesForText(LayoutSVGInlineText*);
48 48
49 void rebuildMetricsForTextLayoutObject(LayoutSVGInlineText*); 49 void rebuildMetricsForTextLayoutObject(LayoutSVGInlineText*);
50 50
51 // Invoked whenever the underlying DOM tree changes, so that m_textPositions is rebuild. 51 // Invoked whenever the underlying DOM tree changes, so that m_textPositions is rebuild.
52 void clearTextPositioningElements() { m_textPositions.clear(); } 52 void clearTextPositioningElements() { m_textPositions.clear(); }
53 unsigned numberOfTextPositioningElements() const { return m_textPositions.si ze(); } 53 unsigned numberOfTextPositioningElements() const { return m_textPositions.si ze(); }
54 54
55 private: 55 private:
56 struct TextPosition { 56 struct TextPosition {
57 TextPosition(SVGTextPositioningElement* newElement = 0, unsigned newStar t = 0, unsigned newLength = 0) 57 TextPosition(SVGTextPositioningElement* newElement = nullptr, unsigned n ewStart = 0, unsigned newLength = 0)
58 : element(newElement) 58 : element(newElement)
59 , start(newStart) 59 , start(newStart)
60 , length(newLength) 60 , length(newLength)
61 { 61 {
62 } 62 }
63 63
64 SVGTextPositioningElement* element; 64 SVGTextPositioningElement* element;
65 unsigned start; 65 unsigned start;
66 unsigned length; 66 unsigned length;
67 }; 67 };
68 68
69 void buildCharacterDataMap(LayoutSVGText&); 69 void buildCharacterDataMap(LayoutSVGText&);
70 void collectTextPositioningElements(LayoutBoxModelObject&, UChar& lastCharac ter); 70 void collectTextPositioningElements(LayoutBoxModelObject&, UChar& lastCharac ter);
71 void fillCharacterDataMap(const TextPosition&); 71 void fillCharacterDataMap(const TextPosition&);
72 72
73 private: 73 private:
74 unsigned m_textLength; 74 unsigned m_textLength;
75 Vector<TextPosition> m_textPositions; 75 Vector<TextPosition> m_textPositions;
76 SVGCharacterDataMap m_characterDataMap; 76 SVGCharacterDataMap m_characterDataMap;
77 }; 77 };
78 78
79 } // namespace blink 79 } // namespace blink
80 80
81 #endif 81 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/svg/SVGResources.h ('k') | Source/core/layout/svg/SVGTextLayoutEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698