Backed out changeset 5ce69082c2fb (bug 1289640)

This commit is contained in:
Iris Hsiao
2016-08-02 16:51:16 +08:00
parent bf6abd8d22
commit bc625871bd

View File

@@ -1117,6 +1117,8 @@ TextureClient::CreateFromSurface(TextureForwarder* aAllocator,
{
aAllocator = aAllocator->AsTextureForwarder();
gfx::BackendType moz2DBackend = BackendTypeForBackendSelector(aLayersBackend, aSelector);
// also test the validity of aAllocator
MOZ_ASSERT(aAllocator && aAllocator->IPCOpen());
if (!aAllocator || !aAllocator->IPCOpen()) {
@@ -1131,8 +1133,6 @@ TextureClient::CreateFromSurface(TextureForwarder* aAllocator,
TextureData* data = nullptr;
#if defined(XP_WIN)
gfx::BackendType moz2DBackend = BackendTypeForBackendSelector(aLayersBackend, aSelector);
int32_t maxTextureSize = aAllocator->GetMaxTextureSize();
if (aLayersBackend == LayersBackend::LAYERS_D3D11 &&