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

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

Issue 1314663002: Remove inclusion of RetainPtr.h in SimpleFontData.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add now-needed include to ScrollbarThemeMacOverlayAPI.mm Created 5 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/platform/fonts/mac/FontPlatformDataMac.mm » ('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 * 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 21 matching lines...) Expand all
32 #include "platform/fonts/FontPlatformData.h" 32 #include "platform/fonts/FontPlatformData.h"
33 #include "platform/fonts/GlyphMetricsMap.h" 33 #include "platform/fonts/GlyphMetricsMap.h"
34 #include "platform/fonts/GlyphPageTreeNode.h" 34 #include "platform/fonts/GlyphPageTreeNode.h"
35 #include "platform/fonts/TypesettingFeatures.h" 35 #include "platform/fonts/TypesettingFeatures.h"
36 #include "platform/fonts/opentype/OpenTypeVerticalData.h" 36 #include "platform/fonts/opentype/OpenTypeVerticalData.h"
37 #include "platform/geometry/FloatRect.h" 37 #include "platform/geometry/FloatRect.h"
38 #include "wtf/OwnPtr.h" 38 #include "wtf/OwnPtr.h"
39 #include "wtf/PassOwnPtr.h" 39 #include "wtf/PassOwnPtr.h"
40 #include "wtf/text/StringHash.h" 40 #include "wtf/text/StringHash.h"
41 41
42 #if OS(MACOSX)
43 #include "wtf/RetainPtr.h"
44 #endif
45
46 namespace blink { 42 namespace blink {
47 43
48 class FontDescription; 44 class FontDescription;
49 45
50 enum FontDataVariant { AutoVariant, NormalVariant, SmallCapsVariant, EmphasisMar kVariant }; 46 enum FontDataVariant { AutoVariant, NormalVariant, SmallCapsVariant, EmphasisMar kVariant };
51 47
52 class PLATFORM_EXPORT SimpleFontData : public FontData { 48 class PLATFORM_EXPORT SimpleFontData : public FontData {
53 public: 49 public:
54 // Used to create platform fonts. 50 // Used to create platform fonts.
55 static PassRefPtr<SimpleFontData> create(const FontPlatformData& platformDat a, PassRefPtr<CustomFontData> customData = nullptr, bool isTextOrientationFallba ck = false) 51 static PassRefPtr<SimpleFontData> create(const FontPlatformData& platformDat a, PassRefPtr<CustomFontData> customData = nullptr, bool isTextOrientationFallba ck = false)
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 width = platformWidthForGlyph(glyph); 215 width = platformWidthForGlyph(glyph);
220 216
221 m_glyphToWidthMap.setMetricsForGlyph(glyph, width); 217 m_glyphToWidthMap.setMetricsForGlyph(glyph, width);
222 return width; 218 return width;
223 } 219 }
224 220
225 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false); 221 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false);
226 222
227 } // namespace blink 223 } // namespace blink
228 #endif // SimpleFontData_h 224 #endif // SimpleFontData_h
OLDNEW
« no previous file with comments | « no previous file | Source/platform/fonts/mac/FontPlatformDataMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698