Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 432a30ebd148

Browse Source
This commit is contained in:
Benoit Jacob 2011-09-18 21:29:08 -04:00
parent 812c11de60
commit dba8879427
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
widget/public/nsIGfxInfo.idl
View File

@ -143,8 +143,5 @@ interface nsIGfxInfo : nsISupports
* underlying GL impl that's used to implement WebGL.
*/
DOMString getWebGLParameter(in DOMString aParam);
// only useful on X11
[noscript, notxpcom] void GetData();
};

3
widget/src/xpwidgets/GfxInfoBase.h
View File

@ -84,9 +84,6 @@ public:
// Ideally, Init() would be void-return, but the rules of
// NS_GENERIC_FACTORY_CONSTRUCTOR_INIT require it be nsresult return.
virtual nsresult Init();
// only useful on X11
virtual void GetData() { }
protected:

3
widget/src/xpwidgets/GfxInfoX11.h
View File

@ -76,8 +76,6 @@ public:
using GfxInfoBase::GetWebGLParameter;
virtual nsresult Init();
virtual void GetData();
protected:
@ -93,6 +91,7 @@ private:
int mMajorVersion, mMinorVersion, mRevisionVersion;
void AddCrashReportAnnotations();
void GetData();
};
} // namespace widget

8
widget/src/xpwidgets/nsBaseWidget.cpp
View File

@ -827,14 +827,10 @@ nsBaseWidget::GetShouldAccelerate()
bool whitelisted = false;
// bug 655578: on X11 at least, we must always call GetFeatureStatus (even if we don't need that information)
// as that's what causes GfxInfo initialization which kills the zombie 'glxtest' process.
nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
if (gfxInfo) {
// bug 655578: on X11 at least, we must always call GetData (even if we don't need that information)
// as that's what causes GfxInfo initialization which kills the zombie 'glxtest' process.
// initially we relied on the fact that GetFeatureStatus calls GetData for us, but bug 681026 showed
// that assumption to be unsafe.
gfxInfo->GetData();
PRInt32 status;
if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_OPENGL_LAYERS, &status))) {
if (status == nsIGfxInfo::FEATURE_NO_INFO) {