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

Side by Side Diff: Source/core/layout/svg/LayoutSVGInlineText.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
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, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
4 * Copyright (C) 2008 Rob Buis <buis@kde.org> 4 * Copyright (C) 2008 Rob Buis <buis@kde.org>
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 private: 50 private:
51 virtual void setTextInternal(PassRefPtr<StringImpl>) override; 51 virtual void setTextInternal(PassRefPtr<StringImpl>) override;
52 virtual void styleDidChange(StyleDifference, const ComputedStyle*) override; 52 virtual void styleDidChange(StyleDifference, const ComputedStyle*) override;
53 53
54 virtual FloatRect objectBoundingBox() const override { return floatLinesBoun dingBox(); } 54 virtual FloatRect objectBoundingBox() const override { return floatLinesBoun dingBox(); }
55 55
56 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVG || type == LayoutObjectSVGInlineText || LayoutText::isOfType(ty pe); } 56 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVG || type == LayoutObjectSVGInlineText || LayoutText::isOfType(ty pe); }
57 57
58 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override; 58 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override;
59 virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* e xtraWidthToEndOfLine = 0) override; 59 virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* e xtraWidthToEndOfLine = nullptr) override;
60 virtual IntRect linesBoundingBox() const override; 60 virtual IntRect linesBoundingBox() const override;
61 virtual InlineTextBox* createTextBox(int start, unsigned short length) overr ide; 61 virtual InlineTextBox* createTextBox(int start, unsigned short length) overr ide;
62 62
63 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxMo delObject* paintInvalidationContainer, const PaintInvalidationState*) const over ride final; 63 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxMo delObject* paintInvalidationContainer, const PaintInvalidationState*) const over ride final;
64 64
65 float m_scalingFactor; 65 float m_scalingFactor;
66 Font m_scaledFont; 66 Font m_scaledFont;
67 SVGTextLayoutAttributes m_layoutAttributes; 67 SVGTextLayoutAttributes m_layoutAttributes;
68 }; 68 };
69 69
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 } 117 }
118 118
119 const LayoutSVGInlineText* m_textLayoutObject; 119 const LayoutSVGInlineText* m_textLayoutObject;
120 unsigned m_metricsListOffset; 120 unsigned m_metricsListOffset;
121 unsigned m_characterOffset; 121 unsigned m_characterOffset;
122 }; 122 };
123 123
124 } 124 }
125 125
126 #endif // LayoutSVGInlineText_h 126 #endif // LayoutSVGInlineText_h
OLDNEW
« no previous file with comments | « Source/core/layout/svg/LayoutSVGInline.h ('k') | Source/core/layout/svg/LayoutSVGInlineText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698