Bug 1316322 - Make Factory::CreateNativeFontResource work for Skia. r=lsalzman
authorJonathan Watt <jwatt@jwatt.org>
Mon, 31 Oct 2016 16:27:19 +0000
changeset 321847 e53f60855051805aa7bf0a1875e7e246c84db997
parent 321846 b3d68ce32250fbaeb3ce452fb7e40746cee6d431
child 321848 2d98eac568db1ea095b0c989d96faa674d3473ec
push id83685
push userjwatt@jwatt.org
push dateWed, 09 Nov 2016 16:49:01 +0000
treeherdermozilla-inbound@ef7bd28df4ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman
bugs1316322
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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);