fixup! Moved clipboard integration from textinput to constellation, t…

…o facilitate sandboxing.

components/compositing/constellation.rs

@@ -389,7 +389,14 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
                                                  event);
             }
             ConstellationMsg::GetClipboardContents(sender) => {
-                sender.send(self.clipboard_ctx.get_contents().unwrap()).unwrap();
+                let result = match self.clipboard_ctx.get_contents() {
+                    Ok(s) => s,
+                    Err(e) => {
+                        debug!("Error getting clipboard contents ({}), defaulting to empty string", e);
+                        "".to_string()
+                    },
+                };
+                sender.send(result).unwrap();
             }
         }
         true

components/script/dom/htmlinputelement.rs

@@ -29,6 +29,7 @@ use dom::htmlformelement::{SubmittedFrom, ResetFrom};
 use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeDamage, NodeTypeId};
 use dom::node::{document_from_node, window_from_node};
 use dom::virtualmethods::VirtualMethods;
+use dom::window::WindowHelpers;
 use textinput::TextInput;
 use textinput::KeyReaction::{TriggerDefaultAction, DispatchInput, Nothing};
 use textinput::Lines::Single;
@@ -116,7 +117,7 @@ impl HTMLInputElement {
             checked_changed: Cell::new(false),
             value_changed: Cell::new(false),
             size: Cell::new(DEFAULT_INPUT_SIZE),
-            textinput: DOMRefCell::new(TextInput::new(Single, "".to_owned(), document)),
+            textinput: DOMRefCell::new(TextInput::new(Single, "".to_owned(), document.window().root().r().constellation_chan())),
             activation_state: DOMRefCell::new(InputActivationState::new())
         }
     }

components/script/dom/htmltextareaelement.rs

@@ -27,6 +27,7 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeDamage, NodeTypeId}
 use dom::node::{document_from_node, window_from_node};
 use textinput::{TextInput, Lines, KeyReaction};
 use dom::virtualmethods::VirtualMethods;
+use dom::window::WindowHelpers;
 use script_task::{ScriptMsg, Runnable};
 
 use util::str::DOMString;
@@ -92,7 +93,7 @@ impl HTMLTextAreaElement {
     fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLTextAreaElement {
         HTMLTextAreaElement {
             htmlelement: HTMLElement::new_inherited(HTMLElementTypeId::HTMLTextAreaElement, localName, prefix, document),
-            textinput: DOMRefCell::new(TextInput::new(Lines::Multiple, "".to_owned(), document)),
+            textinput: DOMRefCell::new(TextInput::new(Lines::Multiple, "".to_owned(), document.window().root().r().constellation_chan())),
             cols: Cell::new(DEFAULT_COLS),
             rows: Cell::new(DEFAULT_ROWS),
             value_changed: Cell::new(false),

components/script/textinput.rs

@@ -5,9 +5,8 @@
 //! Common handling of keyboard input and state management for text input controls
 
 use dom::bindings::codegen::Bindings::KeyboardEventBinding::KeyboardEventMethods;
-use dom::document::{Document, DocumentHelpers};
-use dom::window::WindowHelpers;
-use dom::bindings::js::{JS, JSRef};
+use dom::bindings::js::JSRef;
+use msg::constellation_msg::ConstellationChan;
 use msg::constellation_msg::Msg as ConstellationMsg;
 use dom::keyboardevent::KeyboardEvent;
 use util::str::DOMString;
@@ -34,7 +33,6 @@ struct TextPoint {
 }
 
 /// Encapsulated state for handling keyboard input in a single or multiline text input control.
-#[must_root]
 #[jstraceable]
 pub struct TextInput {
     /// Current text input content, split across lines without trailing '\n'
@@ -45,7 +43,7 @@ pub struct TextInput {
     selection_begin: Option<TextPoint>,
     /// Is this a multiline input?
     multiline: bool,
-    document: JS<Document>,
+    constellation_channel: ConstellationChan
 }
 
 /// Resulting action to be taken by the owner of a text input that is handling an event.
@@ -93,14 +91,13 @@ fn is_control_key(event: JSRef<KeyboardEvent>) -> bool {
 
 impl TextInput {
     /// Instantiate a new text input control
-    #[allow(unrooted_must_root)]
-    pub fn new(lines: Lines, initial: DOMString, document: JSRef<Document>) -> TextInput {
+    pub fn new(lines: Lines, initial: DOMString, cc: ConstellationChan) -> TextInput {
         let mut i = TextInput {
             lines: vec!(),
             edit_point: Default::default(),
             selection_begin: None,
             multiline: lines == Lines::Multiple,
-            document: document.unrooted()
+            constellation_channel: cc,
         };
         i.set_content(initial);
         i
@@ -301,8 +298,7 @@ impl TextInput {
             },
             "v" if is_control_key(event) => {
                 let (tx, rx) = channel();
-                self.document.root().r().window().root().r().constellation_chan().0
-                    .send(ConstellationMsg::GetClipboardContents(tx)).unwrap();
+                self.constellation_channel.0.send(ConstellationMsg::GetClipboardContents(tx)).unwrap();
                 let contents = rx.recv().unwrap();
                 self.insert_string(contents.as_slice());
                 KeyReaction::DispatchInput