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

Auto merge of #6902 - khflab:master, r=jdm

Browse source 
[FIX] Bug fix #6756

fixes #6756 waiting for review.

Signed-off-by: Kayo Hamid <kayo@bvcupons.com.br>

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6902)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-03 09:18:05 -06:00
commit 2ce811ffb8
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/devtools.rs
View file

@ -5,6 +5,7 @@
use devtools_traits::{CachedConsoleMessage, CachedConsoleMessageTypes, PAGE_ERROR, CONSOLE_API};
use devtools_traits::{EvaluateJSReply, NodeInfo, Modification, TimelineMarker, TimelineMarkerType};
use devtools_traits::{ConsoleAPI, PageError};
use dom::bindings::conversions::jsstring_to_str;
use dom::bindings::conversions::FromJSValConvertible;
use dom::bindings::conversions::StringificationBehavior;
use dom::bindings::js::Root;
@ -38,9 +39,7 @@ pub fn handle_evaluate_js(global: &GlobalRef, eval: String, reply: IpcSender<Eva
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.handle(), StringificationBehavior::Default).unwrap())
EvaluateJSReply::StringValue(jsstring_to_str(cx, rval.ptr.to_string()))
} else if rval.ptr.is_null() {
EvaluateJSReply::NullValue
} else {