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

Side by Side Diff: Source/platform/fonts/skia/FontCustomPlatformDataSkia.cpp

Issue 179723005: Remove GDI font rendering code for windows (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Computer, Inc. 2 * Copyright (C) 2007 Apple Computer, Inc.
3 * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved. 3 * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved.
4 * Copyright (C) 2010 Company 100, Inc. 4 * Copyright (C) 2010 Company 100, Inc.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 { 86 {
87 ASSERT_ARG(buffer, buffer); 87 ASSERT_ARG(buffer, buffer);
88 88
89 OpenTypeSanitizer sanitizer(buffer); 89 OpenTypeSanitizer sanitizer(buffer);
90 RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize(); 90 RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize();
91 if (!transcodeBuffer) 91 if (!transcodeBuffer)
92 return nullptr; // validation failed. 92 return nullptr; // validation failed.
93 buffer = transcodeBuffer.get(); 93 buffer = transcodeBuffer.get();
94 94
95 RefPtr<SkMemoryStream> stream = adoptRef(new SkMemoryStream(buffer->getAsSkD ata().get())); 95 RefPtr<SkMemoryStream> stream = adoptRef(new SkMemoryStream(buffer->getAsSkD ata().get()));
96 #if OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS) 96 #if OS(WIN)
97 RefPtr<SkTypeface> typeface = adoptRef(FontCache::fontCache()->fontManager() ->createFromStream(stream.get())); 97 RefPtr<SkTypeface> typeface = adoptRef(FontCache::fontCache()->fontManager() ->createFromStream(stream.get()));
98 #else 98 #else
99 RefPtr<SkTypeface> typeface = adoptRef(SkTypeface::CreateFromStream(stream.g et())); 99 RefPtr<SkTypeface> typeface = adoptRef(SkTypeface::CreateFromStream(stream.g et()));
100 #endif 100 #endif
101 if (!typeface) 101 if (!typeface)
102 return nullptr; 102 return nullptr;
103 103
104 return adoptPtr(new FontCustomPlatformData(typeface.release())); 104 return adoptPtr(new FontCustomPlatformData(typeface.release()));
105 } 105 }
106 106
107 bool FontCustomPlatformData::supportsFormat(const String& format) 107 bool FontCustomPlatformData::supportsFormat(const String& format)
108 { 108 {
109 return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "o pentype") || OpenTypeSanitizer::supportsFormat(format); 109 return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "o pentype") || OpenTypeSanitizer::supportsFormat(format);
110 } 110 }
111 111
112 } 112 }
OLDNEW
« no previous file with comments | « Source/platform/fonts/skia/FontCacheSkia.cpp ('k') | Source/platform/fonts/skia/FontPlatformDataSkia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698