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

Side by Side Diff: content/shell/app/blink_test_platform_support_android.cc

Issue 1181083005: Use new Skia header file in test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | 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 // 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 "third_party/skia/include/ports/SkTypeface_android.h" 7 #include "third_party/skia/include/ports/SkFontMgr_android.h"
8 8
9 namespace { 9 namespace {
10 10
11 // The root directory on the device to which resources will be pushed. This 11 // The root directory on the device to which resources will be pushed. This
12 // value needs to be equal to that set in chromium_android.py. 12 // value needs to be equal to that set in chromium_android.py.
13 #define DEVICE_SOURCE_ROOT_DIR "/data/local/tmp/content_shell/" 13 #define DEVICE_SOURCE_ROOT_DIR "/data/local/tmp/content_shell/"
14 14
15 // Primary font configuration file on the device for Skia. 15 // Primary font configuration file on the device for Skia.
16 const char kPrimaryFontConfig[] = 16 const char kPrimaryFontConfig[] =
17 DEVICE_SOURCE_ROOT_DIR "android_main_fonts.xml"; 17 DEVICE_SOURCE_ROOT_DIR "android_main_fonts.xml";
(...skipping 15 matching lines...) Expand all
33 33
34 bool BlinkTestPlatformInitialize() { 34 bool BlinkTestPlatformInitialize() {
35 // Initialize Skia with the font configuration files crafted for layout tests. 35 // Initialize Skia with the font configuration files crafted for layout tests.
36 SkUseTestFontConfigFile( 36 SkUseTestFontConfigFile(
37 kPrimaryFontConfig, kFallbackFontConfig, kFontDirectory); 37 kPrimaryFontConfig, kFallbackFontConfig, kFontDirectory);
38 38
39 return true; 39 return true;
40 } 40 }
41 41
42 } // namespace content 42 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698