Usage of DirectWrite now determined browser-side

Source/platform/fonts/win/FontCacheSkiaWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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.
@@ skipping 27 matching lines @@
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/fonts/win/FontFallbackWin.h"
 #include "platform/fonts/win/FontPlatformDataWin.h"
 
 namespace WebCore {
 
 FontCache::FontCache()
     : m_purgePreventCount(0)
 {
-    SkFontMgr* fontManager = 0;
+    SkFontMgr* fontManager;
 
-    // Prefer DirectWrite (if runtime feature is enabled) but fallback
-    // to GDI on platforms where DirectWrite is not supported.
-    if (RuntimeEnabledFeatures::directWriteEnabled())
+    if (s_useDirectWrite) {
         fontManager = SkFontMgr_New_DirectWrite();
-
-    // Subpixel text positioning is not supported by the GDI backend.
-    m_useSubpixelPositioning = fontManager
-        ? RuntimeEnabledFeatures::subpixelFontScalingEnabled()
-        : false;
-
-    if (!fontManager)
+    } else {
         fontManager = SkFontMgr_New_GDI();
+        // Subpixel text positioning is not supported by the GDI backend.
+        s_useSubpixelPositioning = false;
+    }
 

[eae, 2014/03/25 22:14:49]

ASSERT(fontManager);

[scottmg, 2014/03/25 22:21:56]

Done.

     m_fontManager = adoptPtr(fontManager);
 }
 
 static bool fontContainsCharacter(const FontPlatformData* fontData, const wchar_t* family, UChar32 character)
 {
     SkPaint paint;
     fontData->setupPaint(&paint);
     paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);
 
     uint16_t glyph;
@@ skipping 132 matching lines @@
     if (!typefacesMatchesFamily(tf.get(), family)) {
         return 0;
     }
 
     FontPlatformData* result = new FontPlatformData(tf,
         name.data(),
         fontSize,
         fontDescription.weight() >= FontWeightBold && !tf->isBold() || fontDescription.isSyntheticBold(),
         fontDescription.style() == FontStyleItalic && !tf->isItalic() || fontDescription.isSyntheticItalic(),
         fontDescription.orientation(),
-        m_useSubpixelPositioning);
+        s_useSubpixelPositioning);
     return result;
 }
 
 }