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

Backed out changeset e039f5fc18d0 (bug 795979) on suspicion of causing failures in browser_sanitize-timespans.js on a CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley 2013-08-20 11:06:32 +01:00
parent c901911fe9
commit 92d6840c2b
5 changed files with 2 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/components/telemetry/Histograms.json
View File

@ -3360,18 +3360,6 @@
"n_buckets": "1000",
"description": "The time (in milliseconds) that it took a 'prototypeAndProperties' request to go round trip."
},
"DEVTOOLS_DEBUGGER_RDP_LOCAL_PROTOTYPESANDPROPERTIES_MS": {
"kind": "exponential",
"high": "10000",
"n_buckets": "1000",
"description": "The time (in milliseconds) that it took a 'prototypesAndProperties' request to go round trip."
},
"DEVTOOLS_DEBUGGER_RDP_REMOTE_PROTOTYPESANDPROPERTIES_MS": {
"kind": "exponential",
"high": "10000",
"n_buckets": "1000",
"description": "The time (in milliseconds) that it took a 'prototypesAndProperties' request to go round trip."
},
"DEVTOOLS_DEBUGGER_RDP_LOCAL_PROPERTY_MS": {
"kind": "exponential",
"high": "10000",

16
toolkit/devtools/client/dbg-client.jsm
View File

@ -1626,22 +1626,8 @@ ThreadClient.prototype = {
return this._threadGrips[aForm.actor] = new SourceClient(this._client,
aForm);
},
}
/**
* Request the prototype and own properties of mutlipleObjects.
*
* @param aOnResponse function
* Called with the request's response.
* @param actors [string]
* List of actor ID of the queried objects.
*/
getPrototypesAndProperties: DebuggerClient.requester({
type: "prototypesAndProperties",
actors: args(0)
}, {
telemetry: "PROTOTYPESANDPROPERTIES"
})
};
eventSource(ThreadClient.prototype);

31
toolkit/devtools/server/actors/script.js
View File

@ -2070,34 +2070,6 @@ ThreadActor.prototype = {
return true;
},
/**
* Get prototypes and properties of multiple objects.
*/
onPrototypesAndProperties: function TA_onPrototypesAndProperties(aRequest) {
let result = {};
for (let actorID of aRequest.actors) {
// This code assumes that there are no lazily loaded actors returned
// by this call.
let actor = this.conn.getActor(actorID);
if (!actor) {
return { from: this.actorID,
error: "noSuchActor" };
}
let handler = actor.onPrototypeAndProperties;
if (!handler) {
return { from: this.actorID,
error: "unrecognizedPacketType",
message: ('Actor "' + actorID +
'" does not recognize the packet type ' +
'"prototypeAndProperties"') };
}
result[actorID] = handler.call(actor, {});
}
return { from: this.actorID,
actors: result };
}
};
ThreadActor.prototype.requestTypes = {
@ -2112,8 +2084,7 @@ ThreadActor.prototype.requestTypes = {
"releaseMany": ThreadActor.prototype.onReleaseMany,
"setBreakpoint": ThreadActor.prototype.onSetBreakpoint,
"sources": ThreadActor.prototype.onSources,
"threadGrips": ThreadActor.prototype.onThreadGrips,
"prototypesAndProperties": ThreadActor.prototype.onPrototypesAndProperties
"threadGrips": ThreadActor.prototype.onThreadGrips
};

65
toolkit/devtools/server/tests/unit/test_objectgrips-09.js
View File

@ -1,65 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/**
* This tests exercises getProtypesAndProperties message accepted
* by a thread actor.
*/
var gDebuggee;
var gClient;
var gThreadClient;
function run_test()
{
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-grips");
gDebuggee.eval(function stopMe(arg1, arg2) {
debugger;
}.toString());
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
attachTestTabAndResume(gClient, "test-grips", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_object_grip();
});
});
do_test_pending();
}
function test_object_grip()
{
gThreadClient.addOneTimeListener("paused", function(aEvent, aPacket) {
let args = aPacket.frame.arguments;
gThreadClient.getPrototypesAndProperties([args[0].actor, args[1].actor], function(aResponse) {
let obj1 = aResponse.actors[args[0].actor];
let obj2 = aResponse.actors[args[1].actor];
do_check_eq(obj1.ownProperties.x.configurable, true);
do_check_eq(obj1.ownProperties.x.enumerable, true);
do_check_eq(obj1.ownProperties.x.writable, true);
do_check_eq(obj1.ownProperties.x.value, 10);
do_check_eq(obj1.ownProperties.y.configurable, true);
do_check_eq(obj1.ownProperties.y.enumerable, true);
do_check_eq(obj1.ownProperties.y.writable, true);
do_check_eq(obj1.ownProperties.y.value, "kaiju");
do_check_eq(obj2.ownProperties.z.configurable, true);
do_check_eq(obj2.ownProperties.z.enumerable, true);
do_check_eq(obj2.ownProperties.z.writable, true);
do_check_eq(obj2.ownProperties.z.value, 123);
do_check_true(obj1.prototype != undefined);
do_check_true(obj2.prototype != undefined);
gThreadClient.resume(function() {
finishClient(gClient);
});
});
});
gDebuggee.eval("stopMe({ x: 10, y: 'kaiju'}, { z: 123 })");
}

1
toolkit/devtools/server/tests/unit/xpcshell.ini
View File

@ -127,7 +127,6 @@ reason = bug 820380
[test_objectgrips-06.js]
[test_objectgrips-07.js]
[test_objectgrips-08.js]
[test_objectgrips-09.js]
[test_interrupt.js]
[test_stepping-01.js]
[test_stepping-02.js]