mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Upgrade to SM 39
This commit is contained in:
Michael Wu
parent
a256f39796
commit
675267b782
205 changed files with 6546 additions and 5340 deletions
|
|
@ -6,18 +6,19 @@ use devtools_traits::{CachedConsoleMessage, CachedConsoleMessageTypes, PAGE_ERRO
|
|||
use devtools_traits::{EvaluateJSReply, NodeInfo, Modification, TimelineMarker, TimelineMarkerType};
|
||||
use dom::bindings::conversions::FromJSValConvertible;
|
||||
use dom::bindings::conversions::StringificationBehavior;
|
||||
use dom::bindings::js::{JSRef, OptionalRootable, Rootable, Temporary};
|
||||
use dom::bindings::js::Root;
|
||||
use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast};
|
||||
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
|
||||
use dom::bindings::codegen::Bindings::DOMRectBinding::{DOMRectMethods};
|
||||
use dom::bindings::codegen::Bindings::ElementBinding::{ElementMethods};
|
||||
use dom::node::{Node, NodeHelpers};
|
||||
use dom::window::{WindowHelpers, ScriptHelpers};
|
||||
use dom::element::Element;
|
||||
use dom::document::DocumentHelpers;
|
||||
use page::{IterablePage, Page};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use script_task::{get_page, ScriptTask};
|
||||
use js::jsapi::RootedValue;
|
||||
use js::jsval::UndefinedValue;
|
||||
|
||||
use std::sync::mpsc::Sender;
|
||||
use std::rc::Rc;
|
||||
|
|
@ -25,53 +26,54 @@ use std::rc::Rc;
|
|||
|
||||
pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, reply: Sender<EvaluateJSReply>){
|
||||
let page = get_page(&*page, pipeline);
|
||||
let window = page.window().root();
|
||||
let window = page.window();
|
||||
let cx = window.r().get_cx();
|
||||
let rval = window.r().evaluate_js_on_global_with_result(&eval);
|
||||
let mut rval = RootedValue::new(cx, UndefinedValue());
|
||||
window.r().evaluate_js_on_global_with_result(&eval, rval.handle_mut());
|
||||
|
||||
reply.send(if rval.is_undefined() {
|
||||
reply.send(if rval.ptr.is_undefined() {
|
||||
EvaluateJSReply::VoidValue
|
||||
} else if rval.is_boolean() {
|
||||
EvaluateJSReply::BooleanValue(rval.to_boolean())
|
||||
} else if rval.is_double() {
|
||||
EvaluateJSReply::NumberValue(FromJSValConvertible::from_jsval(cx, rval, ()).unwrap())
|
||||
} else if rval.is_string() {
|
||||
} else if rval.ptr.is_boolean() {
|
||||
EvaluateJSReply::BooleanValue(rval.ptr.to_boolean())
|
||||
} else if rval.ptr.is_double() {
|
||||
EvaluateJSReply::NumberValue(FromJSValConvertible::from_jsval(cx, rval.handle(), ()).unwrap())
|
||||
} else if rval.ptr.is_string() {
|
||||
//FIXME: use jsstring_to_str when jsval grows to_jsstring
|
||||
EvaluateJSReply::StringValue(
|
||||
FromJSValConvertible::from_jsval(cx, rval, StringificationBehavior::Default).unwrap())
|
||||
} else if rval.is_null() {
|
||||
FromJSValConvertible::from_jsval(cx, rval.handle(), StringificationBehavior::Default).unwrap())
|
||||
} else if rval.ptr.is_null() {
|
||||
EvaluateJSReply::NullValue
|
||||
} else {
|
||||
//FIXME: jsvals don't have an is_int32/is_number yet
|
||||
assert!(rval.is_object());
|
||||
assert!(rval.ptr.is_object());
|
||||
panic!("object values unimplemented")
|
||||
}).unwrap();
|
||||
}
|
||||
|
||||
pub fn handle_get_root_node(page: &Rc<Page>, pipeline: PipelineId, reply: Sender<NodeInfo>) {
|
||||
let page = get_page(&*page, pipeline);
|
||||
let document = page.document().root();
|
||||
let document = page.document();
|
||||
|
||||
let node: JSRef<Node> = NodeCast::from_ref(document.r());
|
||||
let node = NodeCast::from_ref(document.r());
|
||||
reply.send(node.summarize()).unwrap();
|
||||
}
|
||||
|
||||
pub fn handle_get_document_element(page: &Rc<Page>, pipeline: PipelineId, reply: Sender<NodeInfo>) {
|
||||
let page = get_page(&*page, pipeline);
|
||||
let document = page.document().root();
|
||||
let document_element = document.r().GetDocumentElement().root().unwrap();
|
||||
let document = page.document();
|
||||
let document_element = document.r().GetDocumentElement().unwrap();
|
||||
|
||||
let node: JSRef<Node> = NodeCast::from_ref(document_element.r());
|
||||
let node = NodeCast::from_ref(document_element.r());
|
||||
reply.send(node.summarize()).unwrap();
|
||||
}
|
||||
|
||||
fn find_node_by_unique_id(page: &Rc<Page>, pipeline: PipelineId, node_id: String) -> Temporary<Node> {
|
||||
fn find_node_by_unique_id(page: &Rc<Page>, pipeline: PipelineId, node_id: String) -> Root<Node> {
|
||||
let page = get_page(&*page, pipeline);
|
||||
let document = page.document().root();
|
||||
let node: JSRef<Node> = NodeCast::from_ref(document.r());
|
||||
let document = page.document();
|
||||
let node = NodeCast::from_ref(document.r());
|
||||
|
||||
for candidate in node.traverse_preorder() {
|
||||
if candidate.root().r().get_unique_id() == node_id {
|
||||
if candidate.r().get_unique_id() == node_id {
|
||||
return candidate;
|
||||
}
|
||||
}
|
||||
|
|
@ -80,18 +82,17 @@ fn find_node_by_unique_id(page: &Rc<Page>, pipeline: PipelineId, node_id: String
|
|||
}
|
||||
|
||||
pub fn handle_get_children(page: &Rc<Page>, pipeline: PipelineId, node_id: String, reply: Sender<Vec<NodeInfo>>) {
|
||||
let parent = find_node_by_unique_id(&*page, pipeline, node_id).root();
|
||||
let parent = find_node_by_unique_id(&*page, pipeline, node_id);
|
||||
let children = parent.r().children().map(|child| {
|
||||
let child = child.root();
|
||||
child.r().summarize()
|
||||
}).collect();
|
||||
reply.send(children).unwrap();
|
||||
}
|
||||
|
||||
pub fn handle_get_layout(page: &Rc<Page>, pipeline: PipelineId, node_id: String, reply: Sender<(f32, f32)>) {
|
||||
let node = find_node_by_unique_id(&*page, pipeline, node_id).root();
|
||||
let elem: JSRef<Element> = ElementCast::to_ref(node.r()).expect("should be getting layout of element");
|
||||
let rect = elem.GetBoundingClientRect().root();
|
||||
let node = find_node_by_unique_id(&*page, pipeline, node_id);
|
||||
let elem = ElementCast::to_ref(node.r()).expect("should be getting layout of element");
|
||||
let rect = elem.GetBoundingClientRect();
|
||||
let width = *rect.r().Width();
|
||||
let height = *rect.r().Height();
|
||||
reply.send((width, height)).unwrap();
|
||||
|
|
@ -141,8 +142,8 @@ pub fn handle_modify_attribute(page: &Rc<Page>,
|
|||
pipeline: PipelineId,
|
||||
node_id: String,
|
||||
modifications: Vec<Modification>) {
|
||||
let node = find_node_by_unique_id(&*page, pipeline, node_id).root();
|
||||
let elem: JSRef<Element> = ElementCast::to_ref(node.r()).expect("should be getting layout of element");
|
||||
let node = find_node_by_unique_id(&*page, pipeline, node_id);
|
||||
let elem = ElementCast::to_ref(node.r()).expect("should be getting layout of element");
|
||||
|
||||
for modification in modifications.iter(){
|
||||
match modification.newValue {
|
||||
|
|
@ -156,7 +157,7 @@ pub fn handle_modify_attribute(page: &Rc<Page>,
|
|||
|
||||
pub fn handle_wants_live_notifications(page: &Rc<Page>, pipeline_id: PipelineId, send_notifications: bool) {
|
||||
let page = get_page(&*page, pipeline_id);
|
||||
let window = page.window().root();
|
||||
let window = page.window();
|
||||
window.r().set_devtools_wants_updates(send_notifications);
|
||||
}
|
||||
|
||||
|
|
@ -167,7 +168,7 @@ pub fn handle_set_timeline_markers(page: &Rc<Page>,
|
|||
for marker_type in &marker_types {
|
||||
match *marker_type {
|
||||
TimelineMarkerType::Reflow => {
|
||||
let window = page.window().root();
|
||||
let window = page.window();
|
||||
window.r().set_devtools_timeline_marker(TimelineMarkerType::Reflow, reply.clone());
|
||||
}
|
||||
TimelineMarkerType::DOMEvent => {
|
||||
|
|
@ -180,7 +181,7 @@ pub fn handle_set_timeline_markers(page: &Rc<Page>,
|
|||
pub fn handle_drop_timeline_markers(page: &Rc<Page>,
|
||||
script_task: &ScriptTask,
|
||||
marker_types: Vec<TimelineMarkerType>) {
|
||||
let window = page.window().root();
|
||||
let window = page.window();
|
||||
for marker_type in &marker_types {
|
||||
match *marker_type {
|
||||
TimelineMarkerType::Reflow => {
|
||||
|
|
@ -195,6 +196,6 @@ pub fn handle_drop_timeline_markers(page: &Rc<Page>,
|
|||
|
||||
pub fn handle_request_animation_frame(page: &Rc<Page>, id: PipelineId, callback: Box<Fn(f64, )>) {
|
||||
let page = page.find(id).expect("There is no such page");
|
||||
let doc = page.document().root();
|
||||
let doc = page.document();
|
||||
doc.r().request_animation_frame(callback);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue