From f67c45994dedc96eb979e331ab156649847071a4 Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Fri, 17 Feb 2017 17:06:11 -0500
Subject: add ViaSVG to dm

BUG=skia:

Change-Id: I52892a0dd466bee6e3abcaa89a373b93493d201f
Reviewed-on: https://skia-review.googlesource.com/8682
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
---
 src/svg/SkSVGDevice.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/svg')

diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp
index 261ad22d6d..360bb07d44 100644
--- a/src/svg/SkSVGDevice.cpp
+++ b/src/svg/SkSVGDevice.cpp
@@ -563,14 +563,15 @@ void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) {
 
     sk_sp<SkTypeface::LocalizedStrings> familyNameIter(tface->createFamilyNameIterator());
     SkTypeface::LocalizedString familyString;
-    while (familyNameIter->next(&familyString)) {
-        if (familySet.contains(familyString.fString)) {
-            continue;
+    if (familyNameIter) {
+        while (familyNameIter->next(&familyString)) {
+            if (familySet.contains(familyString.fString)) {
+                continue;
+            }
+            familySet.add(familyString.fString);
+            familyName.appendf((familyName.isEmpty() ? "%s" : ", %s"), familyString.fString.c_str());
         }
-        familySet.add(familyString.fString);
-        familyName.appendf((familyName.isEmpty() ? "%s" : ", %s"), familyString.fString.c_str());
     }
-
     if (!familyName.isEmpty()) {
         this->addAttribute("font-family", familyName);
     }
-- 
cgit v1.2.3