Webfont CORS-enabled fetching with fallback

Source/core/fetch/FontResource.cpp

Index: Source/core/fetch/FontResource.cpp
diff --git a/Source/core/fetch/FontResource.cpp b/Source/core/fetch/FontResource.cpp
index 0a0138d10236ad804099fbf37f20d5237eec6bc0..05db84052fe1b02dc0f573ac6592967a918e6796 100644
--- a/Source/core/fetch/FontResource.cpp
+++ b/Source/core/fetch/FontResource.cpp
@@ -50,6 +50,7 @@ FontResource::FontResource(const ResourceRequest& resourceRequest)
     : Resource(resourceRequest, Font)
     , m_loadInitiated(false)
     , m_exceedsFontLoadWaitLimit(false)
+    , m_corsFailed(false)
     , m_fontLoadWaitLimitTimer(this, &FontResource::fontLoadWaitLimitCallback)
 {
 }
@@ -184,9 +185,16 @@ void FontResource::allClientsRemoved()
 void FontResource::checkNotify()
 {
     m_fontLoadWaitLimitTimer.stop();
+
     ResourceClientWalker<FontResourceClient> w(m_clients);
-    while (FontResourceClient* c = w.next())
-        c->fontLoaded(this);
+    // FIXME: Remove this CORS fallback once we have enough UMA to make a decision.
+    if (m_corsFailed) {
+        while (FontResourceClient* client = w.next())
+            client->corsFailed(this);
+    } else {
+        while (FontResourceClient* c = w.next())
+            c->fontLoaded(this);
+    }
 }
 
 }