auto merge of #645 : jdm/servo/window, r=jdm

This one also looks larger than necessary because GetParentObject needed to be changed to return an Option.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs
index a570447cecc..e5e027ed4f1 100644
--- a/src/components/script/dom/formdata.rs
+++ b/src/components/script/dom/formdata.rs
@@ -63,10 +63,10 @@ impl CacheableWrapper for FormData {
 }
 
 impl BindingObject for FormData {
-    fn GetParentObject(&self, cx: *JSContext) -> @mut CacheableWrapper {
+    fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> {
         let page = page_from_context(cx);
         unsafe {
-            (*page).frame.get_ref().window as @mut CacheableWrapper
+            Some((*page).frame.get_ref().window as @mut CacheableWrapper)
         }
     }
 }