nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset 49d7963e43d8 (bug 1202458) for test failures in test_inspector-mutations-value.html

Browse source 
--HG--
extra : rebase_source : daf55daa5c2f5c0a47babdcf86fb8d81f6ce4b99
This commit is contained in:
Carsten "Tomcat" Book 2016-06-02 16:30:08 +02:00
parent eb67af1f6f
commit d08f21c9a8
2 changed files with 12 additions and 19 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintignore
View file

@ -110,7 +110,6 @@ devtools/client/webide/**
devtools/server/**
!devtools/server/actors/webbrowser.js
!devtools/server/actors/styles.js
!devtools/server/actors/string.js
devtools/shared/*.js
!devtools/shared/css-lexer.js
!devtools/shared/defer.js

30
devtools/server/actors/string.js
View file

@ -4,13 +4,14 @@
"use strict";
var {Cu} = require("chrome");
var {DebuggerServer} = require("devtools/server/main");
var promise = require("promise");
var {Class} = require("sdk/core/heritage");
var protocol = require("devtools/shared/protocol");
var {method, Arg, RetVal} = protocol;
var {method, Arg, Option, RetVal} = protocol;
exports.LongStringActor = protocol.ActorClass({
typeName: "longstractor",
@ -63,17 +64,9 @@ exports.ShortLongString = Class({
this.str = str;
},
get length() {
return this.str.length;
},
get initial() {
return this.str;
},
string: function () {
return promise.resolve(this.str);
},
get length() { return this.str.length; },
get initial() { return this.str; },
string: function () { return promise.resolve(this.str); },
substring: function (start, end) {
return promise.resolve(this.str.substring(start, end));
@ -106,12 +99,13 @@ exports.LongStringFront = protocol.FrontClass(exports.LongStringActor, {
string: function () {
if (!this.strPromise) {
let promiseRest = (thusFar) => {
if (thusFar.length === this.length) {
if (thusFar.length === this.length)
return promise.resolve(thusFar);
else {
return this.substring(thusFar.length,
thusFar.length + DebuggerServer.LONG_STRING_READ_LENGTH)
.then((next) => promiseRest(thusFar + next));
}
return this.substring(thusFar.length,
thusFar.length + DebuggerServer.LONG_STRING_READ_LENGTH)
.then((next) => promiseRest(thusFar + next));
};
this.strPromise = promiseRest(this.initial);
@ -130,11 +124,11 @@ protocol.types.addType("longstring", {
if (!(context instanceof protocol.Actor)) {
throw Error("Passing a longstring as an argument isn't supported.");
}
if (value.short) {
return value.str;
} else {
return stringActorType.write(value, context, detail);
}
return stringActorType.write(value, context, detail);
},
read: (value, context, detail) => {
if (context instanceof protocol.Actor) {