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

Auto merge of #6230 - frewsxcv:getters-get, r=nox

Browse source 
Part of #6224

I certainly didn't remove all of them; I avoided `unsafe` areas and also `components/script`

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6230)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-02 08:17:03 -05:00
commit f6fe195334
21 changed files with 62 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/devtools/actor.rs
View file

@ -120,7 +120,7 @@ impl ActorRegistry {
}
/// Get start stamp when registry was started
pub fn get_start_stamp(&self) -> PreciseTime {
pub fn start_stamp(&self) -> PreciseTime {
self.start_stamp.clone()
}

4
components/devtools/actors/network_event.rs
View file

@ -138,7 +138,7 @@ impl NetworkEventActor {
self.response.body = body.clone();
}
pub fn get_event_actor(&self) -> EventActor {
pub fn event_actor(&self) -> EventActor {
// TODO: Send the correct values for startedDateTime, isXHR, private
EventActor {
actor: self.name(),
@ -150,7 +150,7 @@ impl NetworkEventActor {
}
}
pub fn get_response_start(&self) -> ResponseStartMsg {
pub fn response_start(&self) -> ResponseStartMsg {
// TODO: Send the correct values for all these fields.
// This is a fake message.
ResponseStartMsg {

8
components/devtools/actors/timeline.rs
View file

@ -264,7 +264,7 @@ impl Actor for TimelineActor {
}
let emitter = Emitter::new(self.name(), registry.get_shareable(),
registry.get_start_stamp(),
registry.start_stamp(),
stream.try_clone().unwrap(),
self.memory_actor.borrow().clone(),
self.framerate_actor.borrow().clone());
@ -273,8 +273,7 @@ impl Actor for TimelineActor {
let msg = StartReply {
from: self.name(),
value: HighResolutionStamp::new(registry.get_start_stamp(),
PreciseTime::now()),
value: HighResolutionStamp::new(registry.start_stamp(), PreciseTime::now()),
};
stream.write_json_packet(&msg);
true
@ -283,8 +282,7 @@ impl Actor for TimelineActor {
"stop" => {
let msg = StopReply {
from: self.name(),
value: HighResolutionStamp::new(registry.get_start_stamp(),
PreciseTime::now()),
value: HighResolutionStamp::new(registry.start_stamp(), PreciseTime::now()),
};
stream.write_json_packet(&msg);

4
components/devtools/lib.rs
View file

@ -306,7 +306,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
let msg = NetworkEventMsg {
from: console_actor_name,
__type__: "networkEvent".to_string(),
eventActor: actor.get_event_actor(),
eventActor: actor.event_actor(),
};
for stream in connections.iter_mut() {
stream.write_json_packet(&msg);
@ -321,7 +321,7 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
from: netevent_actor_name,
__type__: "networkEventUpdate".to_string(),
updateType: "responseStart".to_string(),
response: actor.get_response_start()
response: actor.response_start()
};
for stream in connections.iter_mut() {