Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make cached messages appear in FF's devtools.

Browse source
This commit is contained in:
Josh Matthews 2015-07-03 09:22:47 -04:00
parent f04779f398
commit 81c0d32a04
3 changed files with 66 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/devtools/actors/console.rs
View file

@ -13,6 +13,7 @@ use protocol::JsonPacketStream;
use devtools_traits::EvaluateJSReply::{NullValue, VoidValue, NumberValue};
use devtools_traits::EvaluateJSReply::{StringValue, BooleanValue, ActorValue};
use devtools_traits::{CachedConsoleMessageTypes, DevtoolScriptControlMsg, PAGE_ERROR, CONSOLE_API};
use devtools_traits::CachedConsoleMessage;
use msg::constellation_msg::PipelineId;
use std::collections::BTreeMap;
@ -21,6 +22,19 @@ use rustc_serialize::json::{self, Json, ToJson};
use std::net::TcpStream;
use std::sync::mpsc::{channel, Sender};
trait EncodableConsoleMessage {
fn encode(&self) -> json::EncodeResult<String>;
}
impl EncodableConsoleMessage for CachedConsoleMessage {
fn encode(&self) -> json::EncodeResult<String> {
match *self {
CachedConsoleMessage::PageError(ref a) => json::encode(a),
CachedConsoleMessage::ConsoleAPI(ref a) => json::encode(a),
}
}
}
#[derive(RustcEncodable)]
struct StartedListenersTraits {
customNetworkRequest: bool,
@ -98,7 +112,9 @@ impl Actor for ConsoleActor {
self.script_chan.send(DevtoolScriptControlMsg::GetCachedMessages(
self.pipeline, message_types, chan)).unwrap();
let messages = try!(port.recv().map_err(|_| ())).into_iter().map(|message| {
json::encode(&message).unwrap().to_json().as_object().unwrap().to_owned()
let json_string = message.encode().unwrap();
let json = Json::from_str(&json_string).unwrap();
json.as_object().unwrap().to_owned()
}).collect();
let msg = GetCachedMessagesReply {