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

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

Issue 2066323002: Remove SK_SUPPORT_LEGACY_TYPEFACE_PTR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moar Mac fixes 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
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 17 matching lines...) Expand all
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "platform/fonts/FontPlatformData.h" 32 #include "platform/fonts/FontPlatformData.h"
33 33
34 #include "SkTypeface.h" 34 #include "SkTypeface.h"
35 #include "platform/LayoutTestSupport.h" 35 #include "platform/LayoutTestSupport.h"
36 #include "platform/fonts/FontCache.h" 36 #include "platform/fonts/FontCache.h"
37 #include "platform/graphics/GraphicsContext.h" 37 #include "platform/graphics/GraphicsContext.h"
38 #include "platform/graphics/skia/SkiaUtils.h"
38 #include <windows.h> 39 #include <windows.h>
39 40
40 namespace blink { 41 namespace blink {
41 42
42 // 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
43 // if available. 44 // if available.
44 const float kMaxSizeForEmbeddedBitmap = 24.0f; 45 const float kMaxSizeForEmbeddedBitmap = 24.0f;
45 46
46 void FontPlatformData::setupPaint(SkPaint* paint, float, const Font*) const 47 void FontPlatformData::setupPaint(SkPaint* paint, float, const Font*) const
47 { 48 {
48 const float ts = m_textSize >= 0 ? m_textSize : 12; 49 const float ts = m_textSize >= 0 ? m_textSize : 12;
49 paint->setTextSize(SkFloatToScalar(m_textSize)); 50 paint->setTextSize(SkFloatToScalar(m_textSize));
50 paint->setTypeface(typeface()); 51 paint->setTypeface(toSkSp(m_typeface));
51 paint->setFakeBoldText(m_syntheticBold); 52 paint->setFakeBoldText(m_syntheticBold);
52 paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0); 53 paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
53 54
54 uint32_t textFlags = paintTextFlags(); 55 uint32_t textFlags = paintTextFlags();
55 uint32_t flags = paint->getFlags(); 56 uint32_t flags = paint->getFlags();
56 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag 57 static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag
57 | SkPaint::kLCDRenderText_Flag 58 | SkPaint::kLCDRenderText_Flag
58 | SkPaint::kEmbeddedBitmapText_Flag 59 | SkPaint::kEmbeddedBitmapText_Flag
59 | SkPaint::kSubpixelText_Flag; 60 | SkPaint::kSubpixelText_Flag;
60 flags &= ~textFlagsMask; 61 flags &= ~textFlagsMask;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 return textFlags; 118 return textFlags;
118 } 119 }
119 120
120 121
121 void FontPlatformData::querySystemForRenderStyle() 122 void FontPlatformData::querySystemForRenderStyle()
122 { 123 {
123 m_paintTextFlags = computePaintTextFlags(fontFamilyName()); 124 m_paintTextFlags = computePaintTextFlags(fontFamilyName());
124 } 125 }
125 126
126 } // namespace blink 127 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp ('k') | ui/gfx/harfbuzz_font_skia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698