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

Backed out changeset 364305744e4c (bug 1297790) for test bustage

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-11-09 10:26:27 +01:00
parent 73b84e56c3
commit 1d94331de7
6 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/ipc/GPUChild.cpp
View File

@ -171,12 +171,6 @@ GPUChild::ActorDestroy(ActorDestroyReason aWhy)
#endif
Telemetry::Accumulate(Telemetry::SUBPROCESS_ABNORMAL_ABORT,
nsDependentCString(XRE_ChildProcessTypeToString(GeckoProcessType_GPU), 1));
// Notify the Telemetry environment so that we can refresh and do a subsession split
if (nsCOMPtr<nsIObserverService> obsvc = services::GetObserverService()) {
obsvc->NotifyObservers(nullptr, "compositor:process-aborted", nullptr);
}
}
gfxVars::RemoveReceiver(this);

22
toolkit/components/telemetry/TelemetryEnvironment.jsm
View File

@ -208,7 +208,6 @@ const PREF_SEARCH_COHORT = "browser.search.cohort";
const PREF_E10S_COHORT = "e10s.rollout.cohort";
const COMPOSITOR_CREATED_TOPIC = "compositor:created";
const COMPOSITOR_PROCESS_ABORTED_TOPIC = "compositor:process-aborted";
const DISTRIBUTION_CUSTOMIZATION_COMPLETE_TOPIC = "distribution-customization-complete";
const EXPERIMENTS_CHANGED_TOPIC = "experiments-changed";
const GFX_FEATURES_READY_TOPIC = "gfx-features-ready";
@ -943,7 +942,6 @@ EnvironmentCache.prototype = {
_addObservers: function () {
// Watch the search engine change and service topics.
Services.obs.addObserver(this, COMPOSITOR_CREATED_TOPIC, false);
Services.obs.addObserver(this, COMPOSITOR_PROCESS_ABORTED_TOPIC, false);
Services.obs.addObserver(this, DISTRIBUTION_CUSTOMIZATION_COMPLETE_TOPIC, false);
Services.obs.addObserver(this, GFX_FEATURES_READY_TOPIC, false);
Services.obs.addObserver(this, SEARCH_ENGINE_MODIFIED_TOPIC, false);
@ -952,7 +950,6 @@ EnvironmentCache.prototype = {
_removeObservers: function () {
Services.obs.removeObserver(this, COMPOSITOR_CREATED_TOPIC);
Services.obs.removeObserver(this, COMPOSITOR_PROCESS_ABORTED_TOPIC);
try {
Services.obs.removeObserver(this, DISTRIBUTION_CUSTOMIZATION_COMPLETE_TOPIC);
} catch (ex) {}
@ -985,11 +982,6 @@ EnvironmentCache.prototype = {
// first compositor to be created and then query nsIGfxInfo again.
this._updateGraphicsFeatures();
break;
case COMPOSITOR_PROCESS_ABORTED_TOPIC:
// Our compositor process has been killed for whatever reason, so refresh
// our reported graphics features and trigger an environment change.
this._onCompositorProcessAborted();
break;
case DISTRIBUTION_CUSTOMIZATION_COMPLETE_TOPIC:
// Distribution customizations are applied after final-ui-startup. query
// partner prefs again when they are ready.
@ -1062,20 +1054,6 @@ EnvironmentCache.prototype = {
this._onEnvironmentChange("search-engine-changed", oldEnvironment);
},
/**
* Refresh the Telemetry environment and trigger an environment change due to
* a change in compositor process (normally this will mean we've fallen back
* from out-of-process to in-process compositing).
*/
_onCompositorProcessAborted: function () {
this._log.trace("_onCompositorProcessAborted");
// Trigger the environment change notification.
let oldEnvironment = Cu.cloneInto(this._currentEnvironment, myScope);
this._updateGraphicsFeatures();
this._onEnvironmentChange("gfx-features-changed", oldEnvironment);
},
/**
* Update the graphics features object.
*/

7
toolkit/components/telemetry/docs/data/environment.rst
View File

@ -178,7 +178,7 @@ Structure:
// "disabled" - User explicitly disabled this default feature.
// "failed" - This feature was attempted but failed to initialize.
// "available" - User has this feature available.
d3d11: { // This feature is Windows-only.
"d3d11" { // This feature is Windows-only.
status: <string>,
warp: <bool>, // Software rendering (WARP) mode was chosen.
textureSharing: <bool> // Whether or not texture sharing works.
@ -186,13 +186,10 @@ Structure:
blacklisted: <bool>, // Whether D3D11 is blacklisted; use to see whether WARP
// was blacklist induced or driver-failure induced.
},
d2d: { // This feature is Windows-only.
"d2d" { // This feature is Windows-only.
status: <string>,
version: <string>, // Either "1.0" or "1.1".
},
gpuProcess: { // Out-of-process compositing ("GPU process") feature
status: <string>, // "Available" means currently in use
},
},
},
},

4
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
View File

@ -635,9 +635,6 @@ function checkSystemSection(data) {
Assert.equal(typeof gfxData.features, "object");
Assert.equal(typeof gfxData.features.compositor, "string");
Assert.equal(typeof gfxData.features.gpuProcess, "object");
Assert.equal(typeof gfxData.features.gpuProcess.status, "string");
try {
// If we've not got nsIGfxInfoDebug, then this will throw and stop us doing
// this test.
@ -650,7 +647,6 @@ function checkSystemSection(data) {
let features = gfxInfo.getFeatures();
Assert.equal(features.compositor, gfxData.features.compositor);
Assert.equal(features.gpuProcess.status, gfxData.features.gpuProcess.status);
Assert.equal(features.opengl, gfxData.features.opengl);
Assert.equal(features.webgl, gfxData.features.webgl);
}

3
widget/GfxInfoBase.cpp
View File

@ -1331,9 +1331,6 @@ GfxInfoBase::BuildFeatureStateLog(JSContext* aCx, const FeatureState& aFeature,
void
GfxInfoBase::DescribeFeatures(JSContext* aCx, JS::Handle<JSObject*> aObj)
{
JS::Rooted<JSObject*> obj(aCx);
gfx::FeatureStatus gpuProcess = gfxConfig::GetValue(Feature::GPU_PROCESS);
InitFeatureObject(aCx, aObj, "gpuProcess", FEATURE_GPU_PROCESS, Some(gpuProcess), &obj);
}
bool

2
widget/nsIGfxInfo.idl
View File

@ -118,8 +118,6 @@ interface nsIGfxInfo : nsISupports
const long FEATURE_VP9_HW_DECODE = 18;
/* Whether NV_dx_interop2 is supported, starting in 50. */
const long FEATURE_DX_INTEROP2 = 19;
/* Whether the GPU process is supported, starting in 52. */
const long FEATURE_GPU_PROCESS = 20;
/*
* A set of return values from GetFeatureStatus