Bug 1075621: Support Direct2D 1.1 for ScaledFontDWrite::CopyGlyphsToBuilder. r=jrmuizel
authorBas Schouten <bschouten@mozilla.com>
Wed, 01 Oct 2014 19:50:24 +0200
changeset 208237 cdf9f8445538bac523c53a450d196b394f596244
parent 208236 165c3fd176ec83c147d112717d105e9a12489ac4
child 208238 7059038f392c15a60d3017a8108531c01f4a3e82
push id27580
push userkwierso@gmail.com
push dateWed, 01 Oct 2014 23:26:55 +0000
treeherdermozilla-central@af6c928893c0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1075621
milestone35.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 1075621: Support Direct2D 1.1 for ScaledFontDWrite::CopyGlyphsToBuilder. r=jrmuizel
gfx/2d/ScaledFontDWrite.cpp
--- a/gfx/2d/ScaledFontDWrite.cpp
+++ b/gfx/2d/ScaledFontDWrite.cpp
@@ -321,17 +321,17 @@ ScaledFontDWrite::GetPathForGlyphs(const
   CopyGlyphsToSink(aBuffer, pathBuilderD2D->GetSink());
 
   return pathBuilder->Finish();
 }
 
 void
 ScaledFontDWrite::CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBuilder, BackendType aBackendType, const Matrix *aTransformHint)
 {
-  if (aBackendType != BackendType::DIRECT2D) {
+  if (aBackendType != BackendType::DIRECT2D && aBackendType != BackendType::DIRECT2D1_1) {
     ScaledFontBase::CopyGlyphsToBuilder(aBuffer, aBuilder, aBackendType, aTransformHint);
     return;
   }
 
   PathBuilderD2D *pathBuilderD2D =
     static_cast<PathBuilderD2D*>(aBuilder);
 
   CopyGlyphsToSink(aBuffer, pathBuilderD2D->GetSink());