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

Side by Side Diff: Source/platform/fonts/win/FontPlatformDataWin.cpp

Issue 692643006: Restore webkit-font-smoothing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Actually suppress flaky tests. 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
« no previous file with comments | « Source/platform/fonts/mac/FontPlatformDataMac.mm ('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 (C) 2006, 2007 Apple Computer, Inc. 2 * Copyright (C) 2006, 2007 Apple Computer, Inc.
3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 26 matching lines...) Expand all
37 #include "platform/fonts/FontCache.h" 37 #include "platform/fonts/FontCache.h"
38 #include "platform/graphics/GraphicsContext.h" 38 #include "platform/graphics/GraphicsContext.h"
39 #include <windows.h> 39 #include <windows.h>
40 40
41 namespace blink { 41 namespace blink {
42 42
43 // Maximum font size, in pixels, at which embedded bitmaps will be used 43 // Maximum font size, in pixels, at which embedded bitmaps will be used
44 // if available. 44 // if available.
45 const float kMaxSizeForEmbeddedBitmap = 24.0f; 45 const float kMaxSizeForEmbeddedBitmap = 24.0f;
46 46
47 void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext* context) cons t 47 void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext* context, cons t Font*) const
48 { 48 {
49 const float ts = m_textSize >= 0 ? m_textSize : 12; 49 const float ts = m_textSize >= 0 ? m_textSize : 12;
50 paint->setTextSize(SkFloatToScalar(m_textSize)); 50 paint->setTextSize(SkFloatToScalar(m_textSize));
51 paint->setTypeface(typeface()); 51 paint->setTypeface(typeface());
52 paint->setFakeBoldText(m_syntheticBold); 52 paint->setFakeBoldText(m_syntheticBold);
53 paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0); 53 paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
54 54
55 uint32_t textFlags = paintTextFlags(); 55 uint32_t textFlags = paintTextFlags();
56 uint32_t flags = paint->getFlags(); 56 uint32_t flags = paint->getFlags();
57 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag | 57 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 { 159 {
160 m_paintTextFlags = computePaintTextFlags(fontFamilyName()); 160 m_paintTextFlags = computePaintTextFlags(fontFamilyName());
161 } 161 }
162 162
163 bool FontPlatformData::defaultUseSubpixelPositioning() 163 bool FontPlatformData::defaultUseSubpixelPositioning()
164 { 164 {
165 return FontCache::fontCache()->useSubpixelPositioning(); 165 return FontCache::fontCache()->useSubpixelPositioning();
166 } 166 }
167 167
168 } // namespace blink 168 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/fonts/mac/FontPlatformDataMac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698