Backout 0d091f3311b4 (bug 1118328) for build bustage on a CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Wed, 07 Jan 2015 16:54:14 -0800
changeset 248398 b30f55f7f94cf1c3f1be50e90d90c9fa79c2145c
parent 248397 92190a900cb0b1a5407f347cdd17a5d6b5d5b0d8
child 248399 11a25a9c085025371c2afd6ed869738d66698ad7
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1118328
milestone37.0a1
backs out0d091f3311b4422a91d35b1764626325bc5252bd
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
Backout 0d091f3311b4 (bug 1118328) for build bustage on a CLOSED TREE
gfx/2d/2D.h
gfx/2d/Factory.cpp
--- 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);