Bug 1316322 - Make Factory::CreateNativeFontResource work for Skia. r=lsalzman
authorJonathan Watt <jwatt@jwatt.org>
Mon, 31 Oct 2016 16:27:19 +0000
changeset 351960 e53f60855051805aa7bf0a1875e7e246c84db997
parent 351959 b3d68ce32250fbaeb3ce452fb7e40746cee6d431
child 351961 2d98eac568db1ea095b0c989d96faa674d3473ec
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman
bugs1316322
milestone52.0a1
Bug 1316322 - Make Factory::CreateNativeFontResource work for Skia. r=lsalzman
gfx/2d/Factory.cpp
--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -506,16 +506,19 @@ Factory::CreateNativeFontResource(uint8_
 #ifdef WIN32
   case FontType::DWRITE:
     {
       return NativeFontResourceDWrite::Create(aData, aSize,
                                               /* aNeedsCairo = */ false);
     }
 #endif
   case FontType::CAIRO:
+#ifdef USE_SKIA
+  case FontType::SKIA:
+#endif
     {
 #ifdef WIN32
       if (GetDirect3D11Device()) {
         return NativeFontResourceDWrite::Create(aData, aSize,
                                                 /* aNeedsCairo = */ true);
       } else {
         return NativeFontResourceGDI::Create(aData, aSize,
                                              /* aNeedsCairo = */ true);