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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/SimpleFontData.h

Issue 2041273002: Remove obsolete friend declarations for MSVC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 * This file is part of the internal font implementation. 2 * This file is part of the internal font implementation.
3 * 3 *
4 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2007-2008 Torch Mobile, Inc. 5 * Copyright (C) 2007-2008 Torch Mobile, Inc.
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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 RefPtr<SimpleFontData> verticalRightOrientation; 170 RefPtr<SimpleFontData> verticalRightOrientation;
171 RefPtr<SimpleFontData> uprightOrientation; 171 RefPtr<SimpleFontData> uprightOrientation;
172 172
173 private: 173 private:
174 DerivedFontData(bool custom) 174 DerivedFontData(bool custom)
175 : forCustomFont(custom) 175 : forCustomFont(custom)
176 { 176 {
177 } 177 }
178 }; 178 };
179 179
180 #if COMPILER(MSVC)
181 friend struct ::WTF::OwnedPtrDeleter<DerivedFontData>;
182 #endif
183 mutable OwnPtr<DerivedFontData> m_derivedFontData; 180 mutable OwnPtr<DerivedFontData> m_derivedFontData;
184 181
185 RefPtr<CustomFontData> m_customFontData; 182 RefPtr<CustomFontData> m_customFontData;
186 }; 183 };
187 184
188 ALWAYS_INLINE FloatRect SimpleFontData::boundsForGlyph(Glyph glyph) const 185 ALWAYS_INLINE FloatRect SimpleFontData::boundsForGlyph(Glyph glyph) const
189 { 186 {
190 FloatRect bounds; 187 FloatRect bounds;
191 if (m_glyphToBoundsMap) { 188 if (m_glyphToBoundsMap) {
192 bounds = m_glyphToBoundsMap->metricsForGlyph(glyph); 189 bounds = m_glyphToBoundsMap->metricsForGlyph(glyph);
(...skipping 17 matching lines...) Expand all
210 width = platformWidthForGlyph(glyph); 207 width = platformWidthForGlyph(glyph);
211 208
212 m_glyphToWidthMap.setMetricsForGlyph(glyph, width); 209 m_glyphToWidthMap.setMetricsForGlyph(glyph, width);
213 return width; 210 return width;
214 } 211 }
215 212
216 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false); 213 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false);
217 214
218 } // namespace blink 215 } // namespace blink
219 #endif // SimpleFontData_h 216 #endif // SimpleFontData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/PODArena.h ('k') | third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698