corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out csets 807f2c3df974, 1637c39b4ed6, ec29e09a270e (bug 811958) for burning android

Browse Source
This commit is contained in:
Jeff Gilbert
2012-11-26 13:48:20 -08:00
parent 152ec8ba6e
commit a35a38f6c7
21 changed files with 1179 additions and 1375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dom/plugins/base/nsNPAPIPluginInstance.cpp
View File

@@ -129,10 +129,7 @@ public:
if (mTextureInfo.mWidth == 0 || mTextureInfo.mHeight == 0)
return 0;
SharedTextureHandle handle =
sPluginContext->CreateSharedHandle(GLContext::SameProcess,
(void*)mTextureInfo.mTexture,
GLContext::TextureID);
SharedTextureHandle handle = sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, (void*)mTextureInfo.mTexture, GLContext::TextureID);
// We want forget about this now, so delete the texture. Assigning it to zero
// ensures that we create a new one in Lock()
@@ -1003,9 +1000,7 @@ SharedTextureHandle nsNPAPIPluginInstance::CreateSharedHandle()
return mContentTexture->CreateSharedHandle();
} else if (mContentSurface) {
EnsureGLContext();
return sPluginContext->CreateSharedHandle(GLContext::SameProcess,
mContentSurface,
GLContext::SurfaceTexture);
return sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, mContentSurface, GLContext::SurfaceTexture);
} else return 0;
}