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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObjec t* paintInvalidationContainer, const PaintInvalidationState*) const final; 63 LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObjec t* paintInvalidationContainer, const PaintInvalidationState*) const 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
70 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutSVGInlineText, isSVGInlineText()); 70 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutSVGInlineText, isSVGInlineText());
71 71
72 class SVGInlineTextMetricsIterator { 72 class SVGInlineTextMetricsIterator {
73 DISALLOW_ALLOCATION(); 73 DISALLOW_NEW();
74 public: 74 public:
75 SVGInlineTextMetricsIterator() { reset(nullptr); } 75 SVGInlineTextMetricsIterator() { reset(nullptr); }
76 76
77 void advanceToTextStart(const LayoutSVGInlineText* textLayoutObject, unsigne d startCharacterOffset) 77 void advanceToTextStart(const LayoutSVGInlineText* textLayoutObject, unsigne d startCharacterOffset)
78 { 78 {
79 ASSERT(textLayoutObject); 79 ASSERT(textLayoutObject);
80 if (m_textLayoutObject != textLayoutObject) { 80 if (m_textLayoutObject != textLayoutObject) {
81 reset(textLayoutObject); 81 reset(textLayoutObject);
82 ASSERT(!metricsList().isEmpty()); 82 ASSERT(!metricsList().isEmpty());
83 } 83 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 } 118 }
119 119
120 const LayoutSVGInlineText* m_textLayoutObject; 120 const LayoutSVGInlineText* m_textLayoutObject;
121 unsigned m_metricsListOffset; 121 unsigned m_metricsListOffset;
122 unsigned m_characterOffset; 122 unsigned m_characterOffset;
123 }; 123 };
124 124
125 } 125 }
126 126
127 #endif // LayoutSVGInlineText_h 127 #endif // LayoutSVGInlineText_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698