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

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

Issue 22924004: remove uncalled local functions (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 4 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 | « src/ports/SkFontHost_win.cpp ('k') | no next file » | 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 2011 Google Inc. 2 * Copyright 2011 Google Inc.
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 #undef GetGlyphIndices 9 #undef GetGlyphIndices
10 10
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 return face; 718 return face;
719 } 719 }
720 720
721 void SkDWriteFontFromTypeface(const SkTypeface* face, IDWriteFont** font) { 721 void SkDWriteFontFromTypeface(const SkTypeface* face, IDWriteFont** font) {
722 if (NULL == face) { 722 if (NULL == face) {
723 HRVM(get_default_font(font), "Could not get default font."); 723 HRVM(get_default_font(font), "Could not get default font.");
724 } else { 724 } else {
725 *font = SkRefComPtr(static_cast<const DWriteFontTypeface*>(face)->fDWrit eFont.get()); 725 *font = SkRefComPtr(static_cast<const DWriteFontTypeface*>(face)->fDWrit eFont.get());
726 } 726 }
727 } 727 }
728 static DWriteFontTypeface* GetDWriteFontByID(SkFontID fontID) {
729 return static_cast<DWriteFontTypeface*>(SkTypefaceCache::FindByID(fontID));
730 }
731 728
732 SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface, 729 SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface,
733 const SkDescriptor* desc) 730 const SkDescriptor* desc)
734 : SkScalerContext(typeface, desc) 731 : SkScalerContext(typeface, desc)
735 , fTypeface(SkRef(typeface)) 732 , fTypeface(SkRef(typeface))
736 , fGlyphCount(-1) { 733 , fGlyphCount(-1) {
737 SkAutoMutexAcquire ac(gFTMutex); 734 SkAutoMutexAcquire ac(gFTMutex);
738 735
739 fXform.m11 = SkScalarToFloat(fRec.fPost2x2[0][0]); 736 fXform.m11 = SkScalarToFloat(fRec.fPost2x2[0][0]);
740 fXform.m12 = SkScalarToFloat(fRec.fPost2x2[1][0]); 737 fXform.m12 = SkScalarToFloat(fRec.fPost2x2[1][0]);
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1860 1857
1861 WCHAR localeNameStorage[LOCALE_NAME_MAX_LENGTH]; 1858 WCHAR localeNameStorage[LOCALE_NAME_MAX_LENGTH];
1862 WCHAR* localeName = NULL; 1859 WCHAR* localeName = NULL;
1863 int localeNameLen = GetUserDefaultLocaleName(localeNameStorage, LOCALE_NAME_ MAX_LENGTH); 1860 int localeNameLen = GetUserDefaultLocaleName(localeNameStorage, LOCALE_NAME_ MAX_LENGTH);
1864 if (localeNameLen) { 1861 if (localeNameLen) {
1865 localeName = localeNameStorage; 1862 localeName = localeNameStorage;
1866 }; 1863 };
1867 1864
1868 return SkNEW_ARGS(SkFontMgr_DirectWrite, (sysFontCollection.get(), localeNam e, localeNameLen)); 1865 return SkNEW_ARGS(SkFontMgr_DirectWrite, (sysFontCollection.get(), localeNam e, localeNameLen));
1869 } 1866 }
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_win.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698