Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1171408 - Move NetworkEventsHandler.getString into WebConsoleClient. r=past

Browse Source 
--HG--
extra : rebase_source : af67f7621d4f3a8b98f27807735f3a982987f9ee
This commit is contained in:
Jan Odvarko 2015-06-17 16:27:20 +02:00
parent b1e3fc910a
commit f61ce95d61
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
browser/devtools/netmonitor/netmonitor-controller.js
View File

@ -713,29 +713,7 @@ NetworkEventsHandler.prototype = {
* are available, or rejected if something goes wrong.
*/
getString: function(aStringGrip) {
// Make sure this is a long string.
if (typeof aStringGrip != "object" || aStringGrip.type != "longString") {
return promise.resolve(aStringGrip); // Go home string, you're drunk.
}
// Fetch the long string only once.
if (aStringGrip._fullText) {
return aStringGrip._fullText.promise;
}
let deferred = aStringGrip._fullText = promise.defer();
let { actor, initial, length } = aStringGrip;
let longStringClient = this.webConsoleClient.longString(aStringGrip);
longStringClient.substring(initial.length, length, aResponse => {
if (aResponse.error) {
Cu.reportError(aResponse.error + ": " + aResponse.message);
deferred.reject(aResponse);
return;
}
deferred.resolve(initial + aResponse.substring);
});
return deferred.promise;
return this.webConsoleClient.getString(aStringGrip);
}
};

41
toolkit/devtools/webconsole/client.js
View File

@ -9,6 +9,7 @@
const {Cc, Ci, Cu} = require("chrome");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
const EventEmitter = require("devtools/toolkit/event-emitter");
const promise = require("promise");
loader.lazyImporter(this, "LongStringClient", "resource://gre/modules/devtools/dbg-client.jsm");
@ -614,5 +615,45 @@ WebConsoleClient.prototype = {
clearNetworkRequests: function () {
this._networkRequests.clear();
},
/**
* Fetches the full text of a LongString.
*
* @param object | string stringGrip
* The long string grip containing the corresponding actor.
* If you pass in a plain string (by accident or because you're lazy),
* then a promise of the same string is simply returned.
* @return object Promise
* A promise that is resolved when the full string contents
* are available, or rejected if something goes wrong.
*/
getString: function(stringGrip) {
// Make sure this is a long string.
if (typeof stringGrip != "object" || stringGrip.type != "longString") {
return promise.resolve(stringGrip); // Go home string, you're drunk.
}
// Fetch the long string only once.
if (stringGrip._fullText) {
return stringGrip._fullText.promise;
}
let deferred = stringGrip._fullText = promise.defer();
let { actor, initial, length } = stringGrip;
let longStringClient = this.longString(stringGrip);
longStringClient.substring(initial.length, length, aResponse => {
if (aResponse.error) {
DevToolsUtils.reportException("getString",
aResponse.error + ": " + aResponse.message);
deferred.reject(aResponse);
return;
}
deferred.resolve(initial + aResponse.substring);
});
return deferred.promise;
}
};