Make text visible when font loading takes longer than 3 seconds

Source/platform/fonts/SegmentedFontData.cpp

 /*
  * Copyright (C) 2008, 2009 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 55 matching lines @@
 bool SegmentedFontData::isLoading() const
 {
     Vector<FontDataRange>::const_iterator end = m_ranges.end();
     for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
         if (it->fontData()->isLoading())
             return true;
     }
     return false;
 }
 
-// Returns true only if all of the sub fonts are loadingFallback.
+// Returns true if any of the sub fonts are loadingFallback.
 bool SegmentedFontData::isLoadingFallback() const
 {
     Vector<FontDataRange>::const_iterator end = m_ranges.end();
     for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
-        if (!it->fontData()->isLoadingFallback())
-            return false;
+        if (it->fontData()->isLoadingFallback())
+            return true;
     }
-    return true;
+    return false;
 }
 
 bool SegmentedFontData::isSegmented() const
 {
     return true;
 }
 
+bool SegmentedFontData::shouldSkipDrawing() const
+{
+    Vector<FontDataRange>::const_iterator end = m_ranges.end();
+    for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
+        if (it->fontData()->shouldSkipDrawing())
+            return true;
+    }
+    return false;
+}
+
 #ifndef NDEBUG
 String SegmentedFontData::description() const
 {
     return "[segmented font]";
 }
 #endif
 
 } // namespace WebCore