Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 502e83464c91 (bug 1629602) for bustages on GfxInfoBase.h . CLOSED TREE

Browse Source
This commit is contained in:
Narcis Beleuzu 2020-04-14 03:51:15 +03:00
parent 6be377b59b
commit f4695206da
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
widget/GfxInfoBase.cpp
View File

@ -1604,21 +1604,21 @@ bool GfxInfoBase::BuildFeatureStateLog(JSContext* aCx,
void GfxInfoBase::DescribeFeatures(JSContext* aCx, JS::Handle<JSObject*> aObj) {
JS::Rooted<JSObject*> obj(aCx);
gfx::FeatureState& gpuProcess =
gfxConfig::GetFeature(gfx::Feature::GPU_PROCESS);
gfx::FeatureStatus gpuProcess =
gfxConfig::GetValue(gfx::Feature::GPU_PROCESS);
InitFeatureObject(aCx, aObj, "gpuProcess", gpuProcess, &obj);
gfx::FeatureState& wrQualified =
gfxConfig::GetFeature(gfx::Feature::WEBRENDER_QUALIFIED);
gfx::FeatureStatus wrQualified =
gfxConfig::GetValue(gfx::Feature::WEBRENDER_QUALIFIED);
InitFeatureObject(aCx, aObj, "wrQualified", wrQualified, &obj);
gfx::FeatureState& webrender = gfxConfig::GetFeature(gfx::Feature::WEBRENDER);
gfx::FeatureStatus webrender = gfxConfig::GetValue(gfx::Feature::WEBRENDER);
InitFeatureObject(aCx, aObj, "webrender", webrender, &obj);
// Only include AL if the platform attempted to use it.
gfx::FeatureState& advancedLayers =
gfxConfig::GetFeature(gfx::Feature::ADVANCED_LAYERS);
if (advancedLayers.GetValue() != FeatureStatus::Unused) {
gfx::FeatureStatus advancedLayers =
gfxConfig::GetValue(gfx::Feature::ADVANCED_LAYERS);
if (advancedLayers != FeatureStatus::Unused) {
InitFeatureObject(aCx, aObj, "advancedLayers", advancedLayers, &obj);
if (gfxConfig::UseFallback(Fallback::NO_CONSTANT_BUFFER_OFFSETTING)) {
@ -1631,23 +1631,17 @@ void GfxInfoBase::DescribeFeatures(JSContext* aCx, JS::Handle<JSObject*> aObj) {
bool GfxInfoBase::InitFeatureObject(JSContext* aCx,
JS::Handle<JSObject*> aContainer,
const char* aName,
mozilla::gfx::FeatureState& aFeatureState,
mozilla::gfx::FeatureStatus& aFeatureStatus,
JS::MutableHandle<JSObject*> aOutObj) {
JS::Rooted<JSObject*> obj(aCx, JS_NewPlainObject(aCx));
if (!obj) {
return false;
}
nsCString status;
if (!aFeatureState.IsEnabled()) {
status.AppendPrintf("%s:%s",
FeatureStatusToString(aFeatureState.GetValue()),
aFeatureState.GetFailureId().get());
} else {
status.Append(FeatureStatusToString(aFeatureState.GetValue()));
}
// Set "status".
const char* status = FeatureStatusToString(aFeatureStatus);
JS::Rooted<JSString*> str(aCx, JS_NewStringCopyZ(aCx, status.get()));
JS::Rooted<JSString*> str(aCx, JS_NewStringCopyZ(aCx, status));
JS::Rooted<JS::Value> val(aCx, JS::StringValue(str));
JS_SetProperty(aCx, obj, "status", val);

2
widget/GfxInfoBase.h
View File

@ -141,7 +141,7 @@ class GfxInfoBase : public nsIGfxInfo,
bool InitFeatureObject(JSContext* aCx, JS::Handle<JSObject*> aContainer,
const char* aName,
mozilla::gfx::FeatureState& aFeatureState,
mozilla::gfx::FeatureStatus& aKnownStatus,
JS::MutableHandle<JSObject*> aOutObj);
NS_IMETHOD ControlGPUProcessForXPCShell(bool aEnable, bool* _retval) override;