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

Bug 811958 - Fix and move ShateType type - r=bgirard

Browse Source
This commit is contained in:
Jeff Gilbert
2012-11-26 14:23:27 -08:00
parent 56cf68079a
commit 8c33e2cc5d
10 changed files with 107 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,10 @@ public:
if (mTextureInfo.mWidth == 0 || mTextureInfo.mHeight == 0)
return 0;
SharedTextureHandle handle = sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, (void*)mTextureInfo.mTexture, GLContext::TextureID);
SharedTextureHandle handle =
sPluginContext->CreateSharedHandle(GLContext::SameProcess,
(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()
@@ -1000,7 +1003,9 @@ SharedTextureHandle nsNPAPIPluginInstance::CreateSharedHandle()
return mContentTexture->CreateSharedHandle();
} else if (mContentSurface) {
EnsureGLContext();
return sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, mContentSurface, GLContext::SurfaceTexture);
return sPluginContext->CreateSharedHandle(GLContext::SameProcess,
mContentSurface,
GLContext::SurfaceTexture);
} else return 0;
}