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

Side by Side Diff: Source/platform/fonts/mac/FontCustomPlatformDataMac.cpp

Issue 715363005: Remove FontPlatformData::m_widthVariant. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments. Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2010 Apple Inc. 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 24 matching lines...) Expand all
35 FontCustomPlatformData::FontCustomPlatformData(CGFontRef cgFont, PassRefPtr<SkTy peface> typeface) 35 FontCustomPlatformData::FontCustomPlatformData(CGFontRef cgFont, PassRefPtr<SkTy peface> typeface)
36 : m_cgFont(AdoptCF, cgFont) 36 : m_cgFont(AdoptCF, cgFont)
37 , m_typeface(typeface) 37 , m_typeface(typeface)
38 { 38 {
39 } 39 }
40 40
41 FontCustomPlatformData::~FontCustomPlatformData() 41 FontCustomPlatformData::~FontCustomPlatformData()
42 { 42 {
43 } 43 }
44 44
45 FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold, bool italic, FontOrientation orientation, FontWidthVariant widthVariant) 45 FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold, bool italic, FontOrientation orientation)
46 { 46 {
47 return FontPlatformData(m_cgFont.get(), m_typeface, size, bold, italic, orie ntation, widthVariant); 47 return FontPlatformData(m_cgFont.get(), m_typeface, size, bold, italic, orie ntation);
48 } 48 }
49 49
50 PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer* buffer) 50 PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer* buffer)
51 { 51 {
52 ASSERT_ARG(buffer, buffer); 52 ASSERT_ARG(buffer, buffer);
53 53
54 OpenTypeSanitizer sanitizer(buffer); 54 OpenTypeSanitizer sanitizer(buffer);
55 RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize(); 55 RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize();
56 if (!transcodeBuffer) 56 if (!transcodeBuffer)
57 return nullptr; // validation failed. 57 return nullptr; // validation failed.
(...skipping 12 matching lines...) Expand all
70 70
71 return adoptPtr(new FontCustomPlatformData(cgFontRef.leakRef(), typeface.rel ease())); 71 return adoptPtr(new FontCustomPlatformData(cgFontRef.leakRef(), typeface.rel ease()));
72 } 72 }
73 73
74 bool FontCustomPlatformData::supportsFormat(const String& format) 74 bool FontCustomPlatformData::supportsFormat(const String& format)
75 { 75 {
76 return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "o pentype") || OpenTypeSanitizer::supportsFormat(format); 76 return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "o pentype") || OpenTypeSanitizer::supportsFormat(format);
77 } 77 }
78 78
79 } // namespace blink 79 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/fonts/mac/FontCacheMac.mm ('k') | Source/platform/fonts/mac/FontPlatformDataMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698