Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset e69e260d5dc7 (bug 1289640) for Assertion failure on DeviceManagerD3D11.cpp

Browse Source
This commit is contained in:
Iris Hsiao 2016-08-02 16:50:14 +08:00
parent b37f479ee0
commit 3a6363f152
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/gl/SharedSurfaceANGLE.cpp
View File

@ -178,7 +178,6 @@ public:
: mIsLocked(false)
, mTexture(texture)
{
MOZ_ASSERT(NS_IsMainThread(), "Must be on the main thread to use d3d11 immediate context");
MOZ_ASSERT(mTexture);
MOZ_ASSERT(succeeded);
*succeeded = false;
@ -198,7 +197,7 @@ public:
}
RefPtr<ID3D11Device> device =
gfx::DeviceManagerD3D11::Get()->GetContentDevice();
gfx::DeviceManagerD3D11::Get()->GetDeviceForCurrentThread();
if (!device) {
return;
}
@ -255,7 +254,7 @@ SharedSurface_ANGLEShareHandle::ReadbackBySharedHandle(gfx::DataSourceSurface* o
MOZ_ASSERT(out_surface);
RefPtr<ID3D11Device> device =
gfx::DeviceManagerD3D11::Get()->GetContentDevice();
gfx::DeviceManagerD3D11::Get()->GetDeviceForCurrentThread();
if (!device) {
return false;
}