mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Update some code that's feature-gated under core.
This commit is contained in:
parent
29a36adbe7
commit
ba87666cdb
33 changed files with 104 additions and 107 deletions
|
@ -93,13 +93,13 @@ impl ActorRegistry {
|
|||
}
|
||||
|
||||
pub fn register_script_actor(&self, script_id: String, actor: String) {
|
||||
println!("registering {} ({})", actor.as_slice(), script_id.as_slice());
|
||||
println!("registering {} ({})", actor, script_id);
|
||||
let mut script_actors = self.script_actors.borrow_mut();
|
||||
script_actors.insert(script_id, actor);
|
||||
}
|
||||
|
||||
pub fn script_to_actor(&self, script_id: String) -> String {
|
||||
if script_id.as_slice() == "" {
|
||||
if script_id.is_empty() {
|
||||
return "".to_string();
|
||||
}
|
||||
self.script_actors.borrow().get(&script_id).unwrap().to_string()
|
||||
|
@ -111,8 +111,8 @@ impl ActorRegistry {
|
|||
|
||||
pub fn actor_to_script(&self, actor: String) -> String {
|
||||
for (key, value) in self.script_actors.borrow().iter() {
|
||||
println!("checking {}", value.as_slice());
|
||||
if value.as_slice() == actor.as_slice() {
|
||||
println!("checking {}", value);
|
||||
if *value == actor {
|
||||
return key.to_string();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -121,13 +121,13 @@ impl Actor for ConsoleActor {
|
|||
msg_type: &String,
|
||||
msg: &json::Object,
|
||||
stream: &mut TcpStream) -> Result<bool, ()> {
|
||||
Ok(match msg_type.as_slice() {
|
||||
Ok(match &**msg_type {
|
||||
"getCachedMessages" => {
|
||||
let types = msg.get(&"messageTypes".to_string()).unwrap().as_array().unwrap();
|
||||
let /*mut*/ messages = vec!();
|
||||
for msg_type in types.iter() {
|
||||
let msg_type = msg_type.as_string().unwrap();
|
||||
match msg_type.as_slice() {
|
||||
match &*msg_type {
|
||||
"ConsoleAPI" => {
|
||||
//TODO: figure out all consoleapi properties from FFOX source
|
||||
}
|
||||
|
|
|
@ -69,7 +69,7 @@ impl Actor for HighlighterActor {
|
|||
msg_type: &String,
|
||||
_msg: &json::Object,
|
||||
stream: &mut TcpStream) -> Result<bool, ()> {
|
||||
Ok(match msg_type.as_slice() {
|
||||
Ok(match &**msg_type {
|
||||
"showBoxModel" => {
|
||||
let msg = ShowBoxModelReply {
|
||||
from: self.name(),
|
||||
|
@ -106,12 +106,12 @@ impl Actor for NodeActor {
|
|||
msg_type: &String,
|
||||
msg: &json::Object,
|
||||
stream: &mut TcpStream) -> Result<bool, ()> {
|
||||
Ok(match msg_type.as_slice() {
|
||||
Ok(match &**msg_type {
|
||||
"modifyAttributes" => {
|
||||
let target = msg.get(&"to".to_string()).unwrap().as_string().unwrap();
|
||||
let mods = msg.get(&"modifications".to_string()).unwrap().as_array().unwrap();
|
||||
let modifications = mods.iter().map(|json_mod| {
|
||||
json::decode(json_mod.to_string().as_slice()).unwrap()
|
||||
json::decode(&json_mod.to_string()).unwrap()
|
||||
}).collect();
|
||||
|
||||
self.script_chan.send(ModifyAttribute(self.pipeline,
|
||||
|
@ -280,7 +280,7 @@ impl Actor for WalkerActor {
|
|||
msg_type: &String,
|
||||
msg: &json::Object,
|
||||
stream: &mut TcpStream) -> Result<bool, ()> {
|
||||
Ok(match msg_type.as_slice() {
|
||||
Ok(match &**msg_type {
|
||||
"querySelector" => {
|
||||
let msg = QuerySelectorReply {
|
||||
from: self.name(),
|
||||
|
@ -426,7 +426,7 @@ impl Actor for PageStyleActor {
|
|||
msg_type: &String,
|
||||
msg: &json::Object,
|
||||
stream: &mut TcpStream) -> Result<bool, ()> {
|
||||
Ok(match msg_type.as_slice() {
|
||||
Ok(match &**msg_type {
|
||||
"getApplied" => {
|
||||
//TODO: query script for relevant applied styles to node (msg.node)
|
||||
let msg = GetAppliedReply {
|
||||
|
@ -498,7 +498,7 @@ impl Actor for InspectorActor {
|
|||
msg_type: &String,
|
||||
_msg: &json::Object,
|
||||
stream: &mut TcpStream) -> Result<bool, ()> {
|
||||
Ok(match msg_type.as_slice() {
|
||||
Ok(match &**msg_type {
|
||||
"getWalker" => {
|
||||
if self.walker.borrow().is_none() {
|
||||
let walker = WalkerActor {
|
||||
|
|
|
@ -55,7 +55,7 @@ impl Actor for RootActor {
|
|||
msg_type: &String,
|
||||
_msg: &json::Object,
|
||||
stream: &mut TcpStream) -> Result<bool, ()> {
|
||||
Ok(match msg_type.as_slice() {
|
||||
Ok(match &**msg_type {
|
||||
"listAddons" => {
|
||||
let actor = ErrorReply {
|
||||
from: "root".to_string(),
|
||||
|
@ -72,7 +72,7 @@ impl Actor for RootActor {
|
|||
from: "root".to_string(),
|
||||
selected: 0,
|
||||
tabs: self.tabs.iter().map(|tab| {
|
||||
registry.find::<TabActor>(tab.as_slice()).encodable()
|
||||
registry.find::<TabActor>(tab).encodable()
|
||||
}).collect()
|
||||
};
|
||||
stream.write_json_packet(&actor);
|
||||
|
|
|
@ -80,7 +80,7 @@ impl Actor for TabActor {
|
|||
msg_type: &String,
|
||||
_msg: &json::Object,
|
||||
stream: &mut TcpStream) -> Result<bool, ()> {
|
||||
Ok(match msg_type.as_slice() {
|
||||
Ok(match &**msg_type {
|
||||
"reconfigure" => {
|
||||
stream.write_json_packet(&ReconfigureReply { from: self.name() });
|
||||
true
|
||||
|
@ -97,7 +97,7 @@ impl Actor for TabActor {
|
|||
javascriptEnabled: true,
|
||||
traits: TabTraits,
|
||||
};
|
||||
let console_actor = registry.find::<ConsoleActor>(self.console.as_slice());
|
||||
let console_actor = registry.find::<ConsoleActor>(&self.console);
|
||||
console_actor.streams.borrow_mut().push(stream.clone());
|
||||
stream.write_json_packet(&msg);
|
||||
console_actor.script_chan.send(
|
||||
|
@ -112,7 +112,7 @@ impl Actor for TabActor {
|
|||
from: self.name(),
|
||||
__type__: "detached".to_string(),
|
||||
};
|
||||
let console_actor = registry.find::<ConsoleActor>(self.console.as_slice());
|
||||
let console_actor = registry.find::<ConsoleActor>(&self.console);
|
||||
console_actor.streams.borrow_mut().pop();
|
||||
stream.write_json_packet(&msg);
|
||||
console_actor.script_chan.send(
|
||||
|
|
|
@ -87,7 +87,7 @@ pub fn start_server(port: u16) -> Sender<DevtoolsControlMsg> {
|
|||
static POLL_TIMEOUT: u64 = 300;
|
||||
|
||||
fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
|
||||
let listener = TcpListener::bind(format!("{}:{}", "127.0.0.1", port).as_slice());
|
||||
let listener = TcpListener::bind(&*format!("{}:{}", "127.0.0.1", port));
|
||||
|
||||
// bind the listener to the specified address
|
||||
let mut acceptor = listener.listen().unwrap();
|
||||
|
@ -193,7 +193,7 @@ fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
|
|||
actor_pipelines: &HashMap<PipelineId, String>) {
|
||||
let console_actor_name = find_console_actor(actors.clone(), id, actor_pipelines);
|
||||
let actors = actors.lock().unwrap();
|
||||
let console_actor = actors.find::<ConsoleActor>(console_actor_name.as_slice());
|
||||
let console_actor = actors.find::<ConsoleActor>(&console_actor_name);
|
||||
match console_message {
|
||||
ConsoleMessage::LogMessage(message, filename, lineNumber, columnNumber) => {
|
||||
let msg = ConsoleAPICall {
|
||||
|
@ -220,7 +220,7 @@ fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
|
|||
actor_pipelines: &HashMap<PipelineId, String>) -> String {
|
||||
let actors = actors.lock().unwrap();
|
||||
let ref tab_actor_name = (*actor_pipelines)[id];
|
||||
let tab_actor = actors.find::<TabActor>(tab_actor_name.as_slice());
|
||||
let tab_actor = actors.find::<TabActor>(tab_actor_name);
|
||||
let console_actor_name = tab_actor.console.clone();
|
||||
return console_actor_name;
|
||||
}
|
||||
|
|
|
@ -20,9 +20,9 @@ impl JsonPacketStream for TcpStream {
|
|||
fn write_json_packet<'a, T: Encodable>(&mut self, obj: &T) {
|
||||
let s = json::encode(obj).unwrap().replace("__type__", "type");
|
||||
println!("<- {}", s);
|
||||
self.write_str(s.len().to_string().as_slice()).unwrap();
|
||||
self.write_str(&s.len().to_string()).unwrap();
|
||||
self.write_u8(':' as u8).unwrap();
|
||||
self.write_str(s.as_slice()).unwrap();
|
||||
self.write_str(&s).unwrap();
|
||||
}
|
||||
|
||||
fn read_json_packet<'a>(&mut self) -> IoResult<Json> {
|
||||
|
@ -35,11 +35,11 @@ impl JsonPacketStream for TcpStream {
|
|||
Ok(c) if c != colon => buffer.push(c as u8),
|
||||
Ok(_) => {
|
||||
let packet_len_str = String::from_utf8(buffer).unwrap();
|
||||
let packet_len = num::from_str_radix(packet_len_str.as_slice(), 10).unwrap();
|
||||
let packet_len = num::from_str_radix(&packet_len_str, 10).unwrap();
|
||||
let packet_buf = self.read_exact(packet_len).unwrap();
|
||||
let packet = String::from_utf8(packet_buf).unwrap();
|
||||
println!("{}", packet);
|
||||
return Ok(Json::from_str(packet.as_slice()).unwrap())
|
||||
return Ok(Json::from_str(&packet).unwrap())
|
||||
},
|
||||
Err(ref e) if e.kind == EndOfFile =>
|
||||
return Err(IoError { kind: EndOfFile, desc: "EOF", detail: None }),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue