Support sideloaded fonts for DirectWrite

Source/platform/fonts/skia/FontCacheSkia.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 106 matching lines @@
         // convert the name to utf8
         name = family.utf8();
     }
 
     int style = SkTypeface::kNormal;
     if (fontDescription.weight() >= FontWeightBold)
         style |= SkTypeface::kBold;
     if (fontDescription.style())
         style |= SkTypeface::kItalic;
 
+#if OS(WIN)
+    if (s_sideloadedFonts) {
+        HashMap<String, SkTypeface*>::iterator i = s_sideloadedFonts->find(name.data());

[eae, 2014/04/12 10:51:33]

The blink convention is to only use the variable name i for indices. How about
"sideloadedFont" or "it" instead? 

[scottmg, 2014/04/12 15:42:39]

Done.

+        if (i != s_sideloadedFonts->end()) {
+            return adoptRef(i->value);
+        }
+    }
     // FIXME: Use SkFontStyle and matchFamilyStyle instead of legacyCreateTypeface.
-#if OS(WIN)
     if (m_fontManager)
         return adoptRef(m_fontManager->legacyCreateTypeface(name.data(), style));
 #endif
 
     return adoptRef(SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style)));
 }
 
 #if !OS(WIN)
 FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family, float fontSize)
 {
     CString name;
     RefPtr<SkTypeface> tf(createTypeface(fontDescription, family, name));
     if (!tf)
         return 0;
 
     FontPlatformData* result = new FontPlatformData(tf,
         name.data(),
         fontSize,
         (fontDescription.weight() >= FontWeightBold && !tf->isBold()) || fontDescription.isSyntheticBold(),
         (fontDescription.style() && !tf->isItalic()) || fontDescription.isSyntheticItalic(),
         fontDescription.orientation(),
         fontDescription.useSubpixelPositioning());
     return result;
 }
 #endif // !OS(WIN)
 
 } // namespace WebCore