diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/css/local_font_face_source.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/css/local_font_face_source.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chromium/third_party/blink/renderer/core/css/local_font_face_source.cc b/chromium/third_party/blink/renderer/core/css/local_font_face_source.cc index df60a91fc0a..d9fe77b710e 100644 --- a/chromium/third_party/blink/renderer/core/css/local_font_face_source.cc +++ b/chromium/third_party/blink/renderer/core/css/local_font_face_source.cc @@ -13,7 +13,7 @@ #include "third_party/blink/renderer/platform/fonts/font_selector.h" #include "third_party/blink/renderer/platform/fonts/font_unique_name_lookup.h" #include "third_party/blink/renderer/platform/fonts/simple_font_data.h" -#include "third_party/blink/renderer/platform/histogram.h" +#include "third_party/blink/renderer/platform/instrumentation/histogram.h" #include "third_party/blink/renderer/platform/wtf/functional.h" namespace blink { @@ -33,10 +33,7 @@ LocalFontFaceSource::LocalFontFaceSource(CSSFontFace* css_font_face, const String& font_name) : face_(css_font_face), font_selector_(font_selector), - font_name_(font_name), - weak_factory_(this) { - was_resolved_ = IsLocalNonBlocking(); -} + font_name_(font_name) {} LocalFontFaceSource::~LocalFontFaceSource() {} @@ -80,7 +77,6 @@ scoped_refptr<SimpleFontData> LocalFontFaceSource::CreateFontData( return CreateLoadingFallbackFontData(font_description); } - DCHECK(was_resolved_); // FIXME(drott) crbug.com/627143: We still have the issue of matching // family name instead of postscript name for local fonts. However, we // should definitely not try to take into account the full requested @@ -119,8 +115,6 @@ void LocalFontFaceSource::BeginLoadIfNeeded() { } void LocalFontFaceSource::NotifyFontUniqueNameLookupReady() { - was_resolved_ = IsLocalFontAvailable(FontDescription()); - PruneTable(); if (face_->FontLoaded(this)) { @@ -141,7 +135,7 @@ bool LocalFontFaceSource::IsLoading() const { } bool LocalFontFaceSource::IsValid() const { - return IsLoading() || was_resolved_; + return IsLoading() || IsLocalFontAvailable(FontDescription()); } void LocalFontFaceSource::LocalFontHistograms::Record(bool load_success) { |