diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 17:15:23 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 17:15:23 +0000 |
| commit | 49270921860ce1cab9bf825e6038fa854943cc28 (patch) | |
| tree | ce3672e84e8e479fecee63813fd89a51931194b7 | |
| parent | 7ae034d651f3536457b9654e3a36a91716a18948 (diff) | |
check for null typeface from paint
git-svn-id: http://skia.googlecode.com/svn/trunk@14998 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | tests/FontObjTest.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/FontObjTest.cpp b/tests/FontObjTest.cpp index d6d60c5326..c2d8f5d328 100644 --- a/tests/FontObjTest.cpp +++ b/tests/FontObjTest.cpp @@ -25,7 +25,10 @@ static bool is_enable_bytecode_hints(const SkPaint& paint) { static void test_cachedfont(skiatest::Reporter* reporter, const SkPaint& paint) { SkAutoTUnref<SkFont> font(SkFont::Testing_CreateFromPaint(paint)); - REPORTER_ASSERT(reporter, font->getTypeface() == paint.getTypeface()); + // Currently SkFont resolves null into the default, so only test if paint's is not null + if (paint.getTypeface()) { + REPORTER_ASSERT(reporter, font->getTypeface() == paint.getTypeface()); + } REPORTER_ASSERT(reporter, font->getSize() == paint.getTextSize()); REPORTER_ASSERT(reporter, font->getScaleX() == paint.getTextScaleX()); REPORTER_ASSERT(reporter, font->getSkewX() == paint.getTextSkewX()); |