Index: third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp |
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp |
index cf7ce8b81954bb9086d4bd25f1c01b05d2c89095..43f41a06a2595527feb0725adde0075c30856aa2 100644 |
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp |
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp |
@@ -206,7 +206,7 @@ bool RemoteFontFaceSource::isLowPriorityLoadingAllowedForRemoteFont() const { |
PassRefPtr<SimpleFontData> RemoteFontFaceSource::createFontData( |
const FontDescription& fontDescription) { |
- if (!isLoaded()) |
+ if (!isLoaded() && !m_font->hasCustomFontData()) |
Takashi Toyoshima
2017/02/23 03:21:37
Should we still have the check of !isLoaded() here
|
return createLoadingFallbackFontData(fontDescription); |
if (!m_font->ensureCustomFontData() || m_period == FailurePeriod) |
Takashi Toyoshima
2017/02/23 03:21:37
I'm not sure these checks are still reasonable.
C
|