summaryrefslogtreecommitdiffstats
path: root/devtools/client/performance
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-03-03 21:26:56 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-03-03 21:26:56 +0100
commit9626500a0ecefde76411b60aeb54051cfdbc90c4 (patch)
tree9f1608d9776d86cf3f100c9c1d73b9b5f76246ed /devtools/client/performance
parentd252c5b2320859c58900b68a7f5ac82199aa1e83 (diff)
downloadUXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.tar
UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.tar.gz
UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.tar.lz
UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.tar.xz
UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.zip
Remove testing-only UI components for e10s
This removes front-end tools only applicable for testing e10s (open non-e10s window, etc.) This resolves #37
Diffstat (limited to 'devtools/client/performance')
-rw-r--r--devtools/client/performance/performance-controller.js3
-rw-r--r--devtools/client/performance/test/browser_perf-recording-notices-05.js4
2 files changed, 3 insertions, 4 deletions
diff --git a/devtools/client/performance/performance-controller.js b/devtools/client/performance/performance-controller.js
index e47a0c401..4bd272f41 100644
--- a/devtools/client/performance/performance-controller.js
+++ b/devtools/client/performance/performance-controller.js
@@ -527,11 +527,10 @@ var PerformanceController = {
if (flags.testing) {
return { supported: true, enabled: true };
}
- let supported = system.constants.E10S_TESTING_ONLY;
// This is only checked on tool startup -- requires a restart if
// e10s subsequently enabled.
let enabled = this._e10s;
- return { supported, enabled };
+ return { supported: false, enabled };
},
/**
diff --git a/devtools/client/performance/test/browser_perf-recording-notices-05.js b/devtools/client/performance/test/browser_perf-recording-notices-05.js
index b6267470d..7a6b6b6b9 100644
--- a/devtools/client/performance/test/browser_perf-recording-notices-05.js
+++ b/devtools/client/performance/test/browser_perf-recording-notices-05.js
@@ -41,8 +41,8 @@ add_task(function* () {
enabled = true;
PerformanceController._setMultiprocessAttributes();
ok($("#performance-view").getAttribute("e10s"), "",
- "When e10s is enabled, but not supported, this probably means we no longer have " +
- "E10S_TESTING_ONLY, and we have no e10s attribute.");
+ "When e10s is enabled, but not supported, this probably means we " +
+ "have no e10s attribute.");
supported = true;
enabled = true;