fixup! Implement X11 clipboard integration (Issue #5376).

components/script/Cargo.toml

@@ -69,6 +69,9 @@ git = "https://github.com/servo/string-cache"
 [dependencies.xlib]
 git = "https://github.com/servo/rust-xlib"
 
+[dependencies.clipboard]
+git = "https://github.com/aweinstock314/rust-x11-clipboard"
+
 [dependencies]
 encoding = "0.2"
 url = "0.2.16"

components/script/lib.rs

@@ -55,6 +55,8 @@ extern crate uuid;
 extern crate string_cache;
 #[cfg(target_os="linux")]
 extern crate xlib;
+#[cfg(target_os="linux")]
+extern crate clipboard;
 
 pub mod cors;
 
@@ -67,7 +69,6 @@ pub mod layout_interface;
 pub mod page;
 pub mod script_task;
 mod timers;
-pub mod clipboard;
 pub mod textinput;
 mod devtools;
 

components/script/textinput.rs

@@ -31,6 +31,8 @@ struct TextPoint {
     index: usize,
 }
 
+no_jsmanaged_fields!(ClipboardContext);
+
 /// Encapsulated state for handling keyboard input in a single or multiline text input control.
 #[jstraceable]
 pub struct TextInput {
@@ -302,7 +304,7 @@ impl TextInput {
                 KeyReaction::Nothing
             },
             "v" if is_control_key(event) => {
-                let contents = self.clipboard_ctx.get_contents();
+                let contents = self.clipboard_ctx.get_contents().unwrap();
                 self.insert_string(contents.as_slice());
                 KeyReaction::DispatchInput
             },