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

Side by Side Diff: third_party/WebKit/Source/web/linux/WebFontRendering.cpp

Issue 1685053002: blink fonts: Load Android SkFontMgr on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@windows_change
Patch Set: Rebase. Created 4 years, 9 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "public/web/linux/WebFontRendering.h" 31 #include "public/web/linux/WebFontRendering.h"
32 32
33 #include "core/layout/LayoutThemeFontProvider.h" 33 #include "core/layout/LayoutThemeFontProvider.h"
34 #include "platform/fonts/FontCache.h"
34 #include "platform/fonts/FontDescription.h" 35 #include "platform/fonts/FontDescription.h"
35 #include "platform/fonts/FontPlatformData.h" 36 #include "platform/fonts/FontPlatformData.h"
36 37
37 using blink::FontDescription; 38 using blink::FontDescription;
38 using blink::FontPlatformData; 39 using blink::FontPlatformData;
39 40
40 namespace blink { 41 namespace blink {
41 42
42 // static 43 // static
44 void WebFontRendering::setSkiaFontManager(SkFontMgr* fontMgr)
45 {
46 WTF::adopted(fontMgr);
47 FontCache::setFontManager(RefPtr<SkFontMgr>(fontMgr));
48 }
49
50 // static
43 void WebFontRendering::setHinting(SkPaint::Hinting hinting) 51 void WebFontRendering::setHinting(SkPaint::Hinting hinting)
44 { 52 {
45 FontPlatformData::setHinting(hinting); 53 FontPlatformData::setHinting(hinting);
46 } 54 }
47 55
48 // static 56 // static
49 void WebFontRendering::setAutoHint(bool useAutoHint) 57 void WebFontRendering::setAutoHint(bool useAutoHint)
50 { 58 {
51 FontPlatformData::setAutoHint(useAutoHint); 59 FontPlatformData::setAutoHint(useAutoHint);
52 } 60 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 SkFontHost::SetSubpixelOrientation(orientation); 95 SkFontHost::SetSubpixelOrientation(orientation);
88 } 96 }
89 97
90 // static 98 // static
91 void WebFontRendering::setDefaultFontSize(int size) 99 void WebFontRendering::setDefaultFontSize(int size)
92 { 100 {
93 LayoutThemeFontProvider::setDefaultFontSize(size); 101 LayoutThemeFontProvider::setDefaultFontSize(size);
94 } 102 }
95 103
96 } // namespace blink 104 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698