author | Wes Kocher <wkocher@mozilla.com> |
Wed, 07 Jan 2015 16:54:14 -0800 | |
changeset 222572 | b30f55f7f94cf1c3f1be50e90d90c9fa79c2145c |
parent 222571 | 92190a900cb0b1a5407f347cdd17a5d6b5d5b0d8 |
child 222573 | 11a25a9c085025371c2afd6ed869738d66698ad7 |
push id | 28068 |
push user | cbook@mozilla.com |
push date | Thu, 08 Jan 2015 13:16:34 +0000 |
treeherder | mozilla-central@2880e05d5e32 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1118328 |
milestone | 37.0a1 |
backs out | 0d091f3311b4422a91d35b1764626325bc5252bd |
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
|
gfx/2d/2D.h | file | annotate | diff | comparison | revisions | |
gfx/2d/Factory.cpp | file | annotate | diff | comparison | revisions |
--- 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);