Backout 0d091f3311b4 (
bug 1118328) for build bustage on a CLOSED TREE
--- a/gfx/2d/2D.h
+++ b/gfx/2d/2D.h
@@ -1176,18 +1176,16 @@ public:
/*
* This creates a new tiled DrawTarget. When a tiled drawtarget is used the
* drawing is distributed over number of tiles which may each hold an
* individual offset. The tiles in the set must each have the same backend
* and format.
*/
static TemporaryRef<DrawTarget> CreateTiledDrawTarget(const TileSet& aTileSet);
- static bool DoesBackendSupportDataDrawtarget(BackendType aType);
-
#ifdef XP_MACOSX
static TemporaryRef<DrawTarget> CreateDrawTargetForCairoCGContext(CGContextRef cg, const IntSize& aSize);
static TemporaryRef<GlyphRenderingOptions>
CreateCGGlyphRenderingOptions(const Color &aFontSmoothingBackgroundColor);
#endif
#ifdef WIN32
static TemporaryRef<DrawTarget> CreateDrawTargetForD3D10Texture(ID3D10Texture2D *aTexture, SurfaceFormat aFormat);
--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -425,33 +425,16 @@ Factory::CreateTiledDrawTarget(const Til
if (!dt->Init(aTileSet)) {
return nullptr;
}
return dt.forget();
}
-bool
-Factory::DoesBackendSupportDataDrawtarget(BackendType aType)
-{
- switch (aType) {
- case BackendType::DIRECT2D:
- case BackendType::DIRECT2D1_1:
- case BackendType::RECORDING:
- case BackendType::NONE:
- case BackendType::COREGRAPHICS_ACCELERATED:
- return false;
- case BackendType::CAIRO:
- case BackendType::COREGRAPHICS:
- case BackendType::SKIA:
- return true;
- }
-}
-
TemporaryRef<ScaledFont>
Factory::CreateScaledFontForNativeFont(const NativeFont &aNativeFont, Float aSize)
{
switch (aNativeFont.mType) {
#ifdef WIN32
case NativeFontType::DWRITE_FONT_FACE:
{
return new ScaledFontDWrite(static_cast<IDWriteFontFace*>(aNativeFont.mFont), aSize);