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

Bug 835533. Avoid adding an ambiguous TextureInfo type. r=snorp

Browse Source 
TextureInfo conflicts with TextureInfo from the layers refactor.
It's not used in many places so just avoid the typedef
This commit is contained in:
Jeff Muizelaar
2013-01-29 11:24:04 -05:00
parent a435970736
commit 2a71bbf1e8
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,6 @@ using namespace mozilla;
using namespace mozilla::gl; using namespace mozilla::gl;
typedef nsNPAPIPluginInstance::TextureInfo TextureInfo;
typedef nsNPAPIPluginInstance::VideoInfo VideoInfo; typedef nsNPAPIPluginInstance::VideoInfo VideoInfo;
class PluginEventRunnable : public nsRunnable class PluginEventRunnable : public nsRunnable
@@ -101,7 +100,7 @@ public:
{ {
} }
TextureInfo Lock() nsNPAPIPluginInstance::TextureInfo Lock()
{ {
if (!EnsureGLContext()) { if (!EnsureGLContext()) {
mTextureInfo.mTexture = 0; mTextureInfo.mTexture = 0;
@@ -116,7 +115,7 @@ public:
return mTextureInfo; return mTextureInfo;
} }
void Release(TextureInfo& aTextureInfo) void Release(nsNPAPIPluginInstance::TextureInfo& aTextureInfo)
{ {
mTextureInfo = aTextureInfo; mTextureInfo = aTextureInfo;
mLock.Unlock(); mLock.Unlock();
@@ -146,7 +145,7 @@ public:
} }
private: private:
TextureInfo mTextureInfo; nsNPAPIPluginInstance::TextureInfo mTextureInfo;
Mutex mLock; Mutex mLock;
}; };
@@ -952,13 +951,13 @@ GLContext* nsNPAPIPluginInstance::GLContext()
return sPluginContext; return sPluginContext;
} }
TextureInfo nsNPAPIPluginInstance::LockContentTexture() nsNPAPIPluginInstance::TextureInfo nsNPAPIPluginInstance::LockContentTexture()
{ {
EnsureSharedTexture(); EnsureSharedTexture();
return mContentTexture->Lock(); return mContentTexture->Lock();
} }
void nsNPAPIPluginInstance::ReleaseContentTexture(TextureInfo& aTextureInfo) void nsNPAPIPluginInstance::ReleaseContentTexture(nsNPAPIPluginInstance::TextureInfo& aTextureInfo)
{ {
EnsureSharedTexture(); EnsureSharedTexture();
mContentTexture->Release(aTextureInfo); mContentTexture->Release(aTextureInfo);