content/renderer/render_font_warmup_win.cc - Issue 729103002: Revert of DirectWrite Font Cache browser side hookup

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/renderer/render_font_warmup_win.cc

Issue 729103002: Revert of DirectWrite Font Cache browser side hookup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « content/public/common/dwrite_font_platform_win.h ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "content/public/renderer/render_font_warmup_win.h"	5 #include "content/public/renderer/render_font_warmup_win.h"

6	6

7 #include <dwrite.h>	7 #include <dwrite.h>

8	8

9 #include "base/debug/alias.h"	9 #include "base/debug/alias.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "base/win/iat_patch_function.h"	11 #include "base/win/iat_patch_function.h"

12 #include "base/win/windows_version.h"	12 #include "base/win/windows_version.h"

13 #include "content/public/common/dwrite_font_platform_win.h"	13 #include "content/common/dwrite_font_platform_win.h"

14 #include "third_party/WebKit/public/web/win/WebFontRendering.h"	14 #include "third_party/WebKit/public/web/win/WebFontRendering.h"

15 #include "third_party/skia/include/core/SkPaint.h"	15 #include "third_party/skia/include/core/SkPaint.h"

16 #include "third_party/skia/include/ports/SkFontMgr.h"	16 #include "third_party/skia/include/ports/SkFontMgr.h"

17 #include "third_party/skia/include/ports/SkTypeface_win.h"	17 #include "third_party/skia/include/ports/SkTypeface_win.h"

18	18

19 namespace content {	19 namespace content {

20	20

21 namespace {	21 namespace {

22	22

23 SkFontMgr* g_warmup_fontmgr = NULL;	23 SkFontMgr* g_warmup_fontmgr = NULL;

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
195	195

196 PatchDWriteFactory(factory);	196 PatchDWriteFactory(factory);

197	197

198 blink::WebFontRendering::setDirectWriteFactory(factory);	198 blink::WebFontRendering::setDirectWriteFactory(factory);

199 g_warmup_fontmgr = SkFontMgr_New_DirectWrite(factory);	199 g_warmup_fontmgr = SkFontMgr_New_DirectWrite(factory);

200 }	200 }

201 return g_warmup_fontmgr;	201 return g_warmup_fontmgr;

202 }	202 }

203	203

204 } // namespace content	204 } // namespace content

OLD	NEW