aboutsummaryrefslogtreecommitdiffstats
path: root/components/devtools/lib.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-08-09 18:27:53 -0600
committerbors-servo <metajack+bors@gmail.com>2015-08-09 18:27:53 -0600
commitf77973c903a3e08067feed3ba39cff3c6bf8ac11 (patch)
treef1281eb62e5bbec2a2002ee17aafe979368b4a84 /components/devtools/lib.rs
parent44d93bc37aa8226554fc73bba20421a150b002de (diff)
parente0f007a940b5d0799f904d12ff46fece45736fc9 (diff)
downloadservo-f77973c903a3e08067feed3ba39cff3c6bf8ac11.tar.gz
servo-f77973c903a3e08067feed3ba39cff3c6bf8ac11.zip
Auto merge of #7101 - HarryLovesCode:master, r=jdm
Allows object evaluation in devtools -- Closes #6724 The purpose of this is to fix how objects were previously evaluated in the developer tools. - Before this, evaluating an object such as the `window` would `panic!` - After this, evaluating an object such as the `window` outputs `[object Window]` A few things to note: - This commit contains `unsafe` code. - This does not contain a test because the developer tools cannot be properly tested until #5971 lands. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7101) <!-- Reviewable:end -->
Diffstat (limited to 'components/devtools/lib.rs')
-rw-r--r--components/devtools/lib.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index c791a9c46f2..d36268901af 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -40,6 +40,7 @@ use actors::console::ConsoleActor;
use actors::network_event::{NetworkEventActor, EventActor, ResponseStartMsg};
use actors::framerate::FramerateActor;
use actors::inspector::InspectorActor;
+use actors::object::ObjectActor;
use actors::root::RootActor;
use actors::tab::TabActor;
use actors::timeline::TimelineActor;
@@ -68,13 +69,14 @@ mod actor;
mod actors {
pub mod console;
pub mod framerate;
- pub mod memory;
pub mod inspector;
+ pub mod memory;
+ pub mod network_event;
+ pub mod object;
pub mod root;
pub mod tab;
pub mod timeline;
pub mod worker;
- pub mod network_event;
}
mod protocol;