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

Side by Side Diff: src/ports/SkFontHost_win.cpp

Issue 2067583002: Revert of Update typeface serialization style. (Closed) Base URL: https://skia.googlesource.com/skia.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
« no previous file with comments | « src/ports/SkFontHost_mac.cpp ('k') | src/ports/SkFontMgr_android.cpp » ('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 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkTypes.h" 8 #include "SkTypes.h"
9 #if defined(SK_BUILD_FOR_WIN32) 9 #if defined(SK_BUILD_FOR_WIN32)
10 10
(...skipping 1696 matching lines...) Expand 10 before | Expand all | Expand 10 after
1707 if (font) { 1707 if (font) {
1708 ::DeleteObject(font); 1708 ::DeleteObject(font);
1709 } 1709 }
1710 } 1710 }
1711 1711
1712 void LogFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc, 1712 void LogFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
1713 bool* isLocalStream) const { 1713 bool* isLocalStream) const {
1714 SkString familyName; 1714 SkString familyName;
1715 this->onGetFamilyName(&familyName); 1715 this->onGetFamilyName(&familyName);
1716 desc->setFamilyName(familyName.c_str()); 1716 desc->setFamilyName(familyName.c_str());
1717 desc->setStyle(this->fontStyle());
1718 *isLocalStream = this->fSerializeAsStream; 1717 *isLocalStream = this->fSerializeAsStream;
1719 } 1718 }
1720 1719
1721 SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics( 1720 SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
1722 PerGlyphInfo perGlyphInfo, 1721 PerGlyphInfo perGlyphInfo,
1723 const uint32_t* glyphIDs, 1722 const uint32_t* glyphIDs,
1724 uint32_t glyphIDsCount) const { 1723 uint32_t glyphIDsCount) const {
1725 LOGFONT lf = fLogFont; 1724 LOGFONT lf = fLogFont;
1726 SkAdvancedTypefaceMetrics* info = nullptr; 1725 SkAdvancedTypefaceMetrics* info = nullptr;
1727 1726
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
2514 2513
2515 private: 2514 private:
2516 SkTDArray<ENUMLOGFONTEX> fLogFontArray; 2515 SkTDArray<ENUMLOGFONTEX> fLogFontArray;
2517 }; 2516 };
2518 2517
2519 /////////////////////////////////////////////////////////////////////////////// 2518 ///////////////////////////////////////////////////////////////////////////////
2520 2519
2521 SkFontMgr* SkFontMgr_New_GDI() { return new SkFontMgrGDI; } 2520 SkFontMgr* SkFontMgr_New_GDI() { return new SkFontMgrGDI; }
2522 2521
2523 #endif//defined(SK_BUILD_FOR_WIN32) 2522 #endif//defined(SK_BUILD_FOR_WIN32)
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_mac.cpp ('k') | src/ports/SkFontMgr_android.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698