Implement CSS font-display

third_party/WebKit/Source/core/css/CSSFontFace.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 45 matching lines @@
 }
 
 void CSSFontFace::fontLoaded(RemoteFontFaceSource* source)
 {
     if (!isValid() || source != m_sources.first())
         return;
 
     if (loadStatus() == FontFace::Loading) {
         if (source->isValid()) {
             setLoadStatus(FontFace::Loaded);
+        } else if (source->displayPeriod() == RemoteFontFaceSource::FailurePeriod) {
+            m_sources.clear();
+            setLoadStatus(FontFace::Error);
         } else {
             m_sources.removeFirst();
             load();
         }
     }
 
     if (m_segmentedFontFace)
-        m_segmentedFontFace->fontLoaded(this);
+        m_segmentedFontFace->fontFaceInvalidated();
 }
 
-void CSSFontFace::fontLoadWaitLimitExceeded(RemoteFontFaceSource* source)
+void CSSFontFace::didBecomeVisibleFallback(RemoteFontFaceSource* source)
 {
     if (!isValid() || source != m_sources.first())
         return;
     if (m_segmentedFontFace)
-        m_segmentedFontFace->fontLoadWaitLimitExceeded(this);
+        m_segmentedFontFace->fontFaceInvalidated();
 }
 
 PassRefPtr<SimpleFontData> CSSFontFace::getFontData(const FontDescription& fontDescription)
 {
     if (!isValid())
         return nullptr;
 
     while (!m_sources.isEmpty()) {
         OwnPtrWillBeMember<CSSFontFaceSource>& source = m_sources.first();
         if (RefPtr<SimpleFontData> result = source->getFontData(fontDescription)) {
@@ skipping 162 matching lines @@
 }
 
 DEFINE_TRACE(CSSFontFace)
 {
     visitor->trace(m_segmentedFontFace);
     visitor->trace(m_sources);
     visitor->trace(m_fontFace);
 }
 
 }