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

Don't pass nullable strings to native DOM methods that want non-nullable strings. Fixes #1207.

Browse source
This commit is contained in:
Ms2ger 2013-11-10 14:11:15 +01:00
parent 803cd4b7cf
commit 08afc6d19d
75 changed files with 968 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/components/script/dom/window.rs
View file

@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::codegen::WindowBinding;
use dom::bindings::utils::{Reflectable, Reflector};
use dom::bindings::utils::{DOMString, null_str_as_empty, Traceable};
use dom::bindings::utils::{Reflectable, Reflector, Traceable};
use dom::bindings::utils::DOMString;
use dom::document::AbstractDocument;
use dom::eventtarget::{EventTarget, WindowTypeId};
use dom::node::{AbstractNode, ScriptView};
@ -72,9 +72,9 @@ pub struct TimerData {
}
impl Window {
pub fn Alert(&self, s: &Option<DOMString>) {
pub fn Alert(&self, s: &DOMString) {
// Right now, just print to the console
println(format!("ALERT: {:s}", null_str_as_empty(s)));
println(format!("ALERT: {:s}", *s));
}
pub fn Close(&self) {
@ -85,18 +85,18 @@ impl Window {
self.page.frame.unwrap().document
}
pub fn Name(&self) -> Option<DOMString> {
None
pub fn Name(&self) -> DOMString {
~""
}
pub fn SetName(&self, _name: &Option<DOMString>) {
pub fn SetName(&self, _name: &DOMString) {
}
pub fn Status(&self) -> Option<DOMString> {
None
pub fn Status(&self) -> DOMString {
~""
}
pub fn SetStatus(&self, _status: &Option<DOMString>) {
pub fn SetStatus(&self, _status: &DOMString) {
}
pub fn Closed(&self) -> bool {
@ -123,18 +123,18 @@ impl Window {
self.navigator.unwrap()
}
pub fn Confirm(&self, _message: &Option<DOMString>) -> bool {
pub fn Confirm(&self, _message: &DOMString) -> bool {
false
}
pub fn Prompt(&self, _message: &Option<DOMString>, _default: &Option<DOMString>) -> Option<DOMString> {
pub fn Prompt(&self, _message: &DOMString, _default: &DOMString) -> Option<DOMString> {
None
}
pub fn Print(&self) {
}
pub fn ShowModalDialog(&self, _cx: *JSContext, _url: &Option<DOMString>, _argument: JSVal) -> JSVal {
pub fn ShowModalDialog(&self, _cx: *JSContext, _url: &DOMString, _argument: JSVal) -> JSVal {
JSVAL_NULL
}
}