mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 16:25:38 +00:00
Backed out 2 changesets (bug 1525966) for causing devtools failures.
Backed out changeset 06ca873edb4c (bug 1525966) Backed out changeset 8ff967efc6d6 (bug 1525966) CLOSED TREE --HG-- extra : rebase_source : 8fb6432626ea832ed4bf081068d0c1144de066bd
This commit is contained in:
parent
6d5cb26d20
commit
4ccc5c732e
@ -138,8 +138,7 @@ class BrowsingContextTargetFront extends TargetMixin(
|
||||
response = await super.detach();
|
||||
} catch (e) {
|
||||
console.warn(
|
||||
"Error while detaching the browsing context target front:",
|
||||
e
|
||||
`Error while detaching the browsing context target front: ${e.message}`
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -454,7 +454,7 @@ function TargetMixin(parentClass) {
|
||||
} catch (e) {
|
||||
// Ignore any errors while closing, since there is not much that can be done
|
||||
// at this point.
|
||||
console.warn("Error while closing client:", e);
|
||||
console.warn(`Error while closing client: ${e.message}`);
|
||||
}
|
||||
|
||||
// Not all targets supports attach/detach. For example content process doesn't.
|
||||
@ -467,7 +467,7 @@ function TargetMixin(parentClass) {
|
||||
try {
|
||||
await this.detach();
|
||||
} catch (e) {
|
||||
console.warn("Error while detaching target:", e);
|
||||
console.warn(`Error while detaching target: ${e.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -92,7 +92,9 @@ class WorkerTargetFront extends TargetMixin(
|
||||
try {
|
||||
response = await super.detach();
|
||||
} catch (e) {
|
||||
console.warn("Error while detaching the worker target front:", e);
|
||||
console.warn(
|
||||
`Error while detaching the worker target front: ${e.message}`
|
||||
);
|
||||
}
|
||||
|
||||
if (this.registration) {
|
||||
|
@ -266,6 +266,8 @@ class Front extends Pool {
|
||||
callFunctionWithAsyncStack(
|
||||
() => {
|
||||
if (packet.error) {
|
||||
// "Protocol error" is here to avoid TBPL heuristics. See also
|
||||
// https://dxr.mozilla.org/webtools-central/source/tbpl/php/inc/GeneralErrorFilter.php
|
||||
let message;
|
||||
if (packet.error && packet.message) {
|
||||
message =
|
||||
@ -273,8 +275,7 @@ class Front extends Pool {
|
||||
} else {
|
||||
message = packet.error;
|
||||
}
|
||||
const packetError = new Error(message);
|
||||
deferred.reject(packetError);
|
||||
deferred.reject(message);
|
||||
} else {
|
||||
deferred.resolve(packet);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user