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

Unified Diff: tests/SerializationTest.cpp

Issue 1120823002: Move resource fonts to common location. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove now unused variable. Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/FontHostTest.cpp ('k') | tools/Resources.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/SerializationTest.cpp
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index f6a8a7d5fc48d0b06f63fff33f512bb4c1630146..f7e298305f86fc5741b7d07422485785c95dbbe1 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -317,14 +317,8 @@ static void compare_bitmaps(skiatest::Reporter* reporter,
}
static void TestPictureTypefaceSerialization(skiatest::Reporter* reporter) {
- // Load typeface form file.
- // This test cannot run if there is no resource path.
- SkString resourcePath = GetResourcePath();
- if (resourcePath.isEmpty()) {
- SkDebugf("Could not run fontstream test because resourcePath not specified.");
- return;
- }
- SkString filename = SkOSPath::Join(resourcePath.c_str(), "test.ttc");
+ // Load typeface form file to test CreateFromFile with index.
+ SkString filename = GetResourcePath("/fonts/test.ttc");
SkTypeface* typeface = SkTypeface::CreateFromFile(filename.c_str(), 1);
if (!typeface) {
SkDebugf("Could not run fontstream test because test.ttc not found.");
« no previous file with comments | « tests/FontHostTest.cpp ('k') | tools/Resources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698