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

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

Issue 14884010: Mask orientation and layout correctly. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Add comment about CoreGraphics 'normal' hinting. Created 7 years, 7 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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "SkAdvancedTypefaceMetrics.h" 9 #include "SkAdvancedTypefaceMetrics.h"
10 #include "SkBase64.h" 10 #include "SkBase64.h"
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 setStyle(&lf, style); 1632 setStyle(&lf, style);
1633 return SkCreateTypefaceFromLOGFONT(lf); 1633 return SkCreateTypefaceFromLOGFONT(lf);
1634 } 1634 }
1635 1635
1636 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { 1636 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
1637 SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); 1637 SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
1638 return stream.get() ? CreateTypefaceFromStream(stream) : NULL; 1638 return stream.get() ? CreateTypefaceFromStream(stream) : NULL;
1639 } 1639 }
1640 1640
1641 void LogFontTypeface::onFilterRec(SkScalerContextRec* rec) const { 1641 void LogFontTypeface::onFilterRec(SkScalerContextRec* rec) const {
1642 if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag ||
1643 rec->fFlags & SkScalerContext::kLCD_Vertical_Flag)
1644 {
1645 rec->fMaskFormat = SkMask::kA8_Format;
1646 rec->fFlags |= SkScalerContext::kGenA8FromLCD_Flag;
1647 }
1648
1642 unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | 1649 unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag |
1643 SkScalerContext::kAutohinting_Flag | 1650 SkScalerContext::kAutohinting_Flag |
1644 SkScalerContext::kEmbeddedBitmapText_Flag | 1651 SkScalerContext::kEmbeddedBitmapText_Flag |
1645 SkScalerContext::kEmbolden_Flag | 1652 SkScalerContext::kEmbolden_Flag |
1646 SkScalerContext::kSubpixelPositioning_Flag | 1653 SkScalerContext::kSubpixelPositioning_Flag |
1647 SkScalerContext::kLCD_BGROrder_Flag | 1654 SkScalerContext::kLCD_BGROrder_Flag |
1648 SkScalerContext::kLCD_Vertical_Flag; 1655 SkScalerContext::kLCD_Vertical_Flag;
1649 rec->fFlags &= ~flagsWeDontSupport; 1656 rec->fFlags &= ~flagsWeDontSupport;
1650 1657
1651 SkPaint::Hinting h = rec->getHinting(); 1658 SkPaint::Hinting h = rec->getHinting();
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
1851 return this->createFromStream(stream); 1858 return this->createFromStream(stream);
1852 } 1859 }
1853 1860
1854 private: 1861 private:
1855 SkTDArray<ENUMLOGFONTEX> fLogFontArray; 1862 SkTDArray<ENUMLOGFONTEX> fLogFontArray;
1856 }; 1863 };
1857 1864
1858 SkFontMgr* SkFontMgr::Factory() { 1865 SkFontMgr* SkFontMgr::Factory() {
1859 return SkNEW(SkFontMgrGDI); 1866 return SkNEW(SkFontMgrGDI);
1860 } 1867 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698