☠☠ backed out by 92190a900cb0 ☠ ☠ | |
author | Bas Schouten <bschouten@mozilla.com> |
Wed, 07 Jan 2015 22:58:25 +0100 | |
changeset 222541 | 467595d3992901497c87fa93b465b9079b22bc5b |
parent 222540 | 0d091f3311b4422a91d35b1764626325bc5252bd |
child 222542 | a909e2281ed1d54d44236a405e61b8aca735a636 |
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) |
reviewers | jrmuizel |
bugs | 1118328 |
milestone | 37.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
|
--- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -1177,26 +1177,22 @@ gfxPlatform::CreateOffscreenContentDrawT return CreateDrawTargetForBackend(mContentBackend, aSize, aFormat); } TemporaryRef<DrawTarget> gfxPlatform::CreateDrawTargetForData(unsigned char* aData, const IntSize& aSize, int32_t aStride, SurfaceFormat aFormat) { NS_ASSERTION(mContentBackend != BackendType::NONE, "No backend."); - RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForData(mContentBackend, + BackendType backendType = Factory::DoesBackendSupportDataDrawtarget(mContentBackend) ? mContentBackend : BackendType::CAIRO; + + RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForData(backendType, aData, aSize, aStride, aFormat); - if (!dt) { - // Factory::CreateDrawTargetForData does not support mContentBackend; retry - // with BackendType::CAIRO: - dt = Factory::CreateDrawTargetForData(BackendType::CAIRO, - aData, aSize, - aStride, aFormat); - } + return dt.forget(); } /* static */ BackendType gfxPlatform::BackendTypeForName(const nsCString& aName) { if (aName.EqualsLiteral("cairo")) return BackendType::CAIRO;