content/shell/app/blink_test_platform_support_android.cc - Issue 2618443002: Remove use of legacy SkFontMgr factories.

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/shell/app/blink_test_platform_support_android.cc

Issue 2618443002: Remove use of legacy SkFontMgr factories. (Closed)

Patch Set: Address comments. Created 3 years, 11 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/shell/app/blink_test_platform_support.h"	5 #include "content/shell/app/blink_test_platform_support.h"

6	6

7 #include "skia/ext/fontmgr_default_android.h"	7 #include "skia/ext/fontmgr_default_android.h"

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

8 #include "third_party/skia/include/ports/SkFontMgr_android.h"	9 #include "third_party/skia/include/ports/SkFontMgr_android.h"

9	10

10 namespace {	11 namespace {

11	12

12 // The root directory on the device to which resources will be pushed. This	13 // The root directory on the device to which resources will be pushed. This

13 // value needs to be equal to that set in chromium_android.py.	14 // value needs to be equal to that set in chromium_android.py.

14 #define DEVICE_SOURCE_ROOT_DIR "/data/local/tmp/content_shell/"	15 #define DEVICE_SOURCE_ROOT_DIR "/data/local/tmp/content_shell/"

15	16

16 // Primary font configuration file on the device for Skia.	17 // Primary font configuration file on the device for Skia.

17 const char kPrimaryFontConfig[] =	18 const char kPrimaryFontConfig[] =

(...skipping 21 matching lines...) Expand all Loading...
39 custom.fBasePath = kFontDirectory;	40 custom.fBasePath = kFontDirectory;

40 custom.fFontsXml = kPrimaryFontConfig;	41 custom.fFontsXml = kPrimaryFontConfig;

41 custom.fFallbackFontsXml = kFallbackFontConfig;	42 custom.fFallbackFontsXml = kFallbackFontConfig;

42 custom.fIsolated = false;	43 custom.fIsolated = false;

43	44

44 SetDefaultSkiaFactory(SkFontMgr_New_Android(&custom));	45 SetDefaultSkiaFactory(SkFontMgr_New_Android(&custom));

45 return true;	46 return true;

46 }	47 }

47	48

48 } // namespace content	49 } // namespace content

OLD	NEW