diff --git a/chromium/third_party/WebKit/Source/platform/exported/linux/WebFontInfo.cpp b/chromium/third_party/WebKit/Source/platform/exported/linux/WebFontInfo.cpp
index 74cf27e777fe1791627b5e81efc86fa7771053c1..6a89398f4d58eb772dea356d3017ca3edf81a296 100644
--- a/chromium/third_party/WebKit/Source/platform/exported/linux/WebFontInfo.cpp
+++ b/chromium/third_party/WebKit/Source/platform/exported/linux/WebFontInfo.cpp
@@ -141,9 +141,12 @@ void WebFontInfo::renderStyleForStrike(const char* family, int sizeAndStyle, Web
     FcPattern* pattern = FcPatternCreate();
     FcValue fcvalue;
 
-    fcvalue.type = FcTypeString;
-    fcvalue.u.s = reinterpret_cast<const FcChar8 *>(family);
-    FcPatternAdd(pattern, FC_FAMILY, fcvalue, FcFalse);
+    // A WebFont might not have family name yet, but we still want to pick up defaults for the size and style.
+    if (family && *family) {
+        fcvalue.type = FcTypeString;
+        fcvalue.u.s = reinterpret_cast<const FcChar8 *>(family);
+        FcPatternAdd(pattern, FC_FAMILY, fcvalue, FcFalse);
+    }
 
     fcvalue.type = FcTypeInteger;
     fcvalue.u.i = isBold ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL;
diff --git a/chromium/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinuxHarfBuzz.cpp b/chromium/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinuxHarfBuzz.cpp
index 430f6b756ef6bded56494e8c43bd444068bcf0ee..2f4922da40efd4a7e0c1005c0113045e06760b87 100644
--- a/chromium/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinuxHarfBuzz.cpp
+++ b/chromium/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinuxHarfBuzz.cpp
@@ -104,8 +104,10 @@ static inline void getRenderStyleForStrike(FontRenderStyle& fontRenderStyle, con
 #if OS(ANDROID)
     style.setDefaults();
 #else
-    if (!font || !*font)
-        style.setDefaults(); // It's probably a webfont. Take the system defaults.
+    if (!font || !*font) {
+        // This is probably a webfont.
+        blink::WebFontInfo::renderStyleForStrike(font, sizeAndStyle, &style);
+    }
     else if (blink::Platform::current()->sandboxSupport())
         blink::Platform::current()->sandboxSupport()->getRenderStyleForStrike(font, sizeAndStyle, &style);
     else