diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-06 16:09:37 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-06 16:09:37 -0500 |
| commit | 5cb1356e9e3dbde9fd841c9aa2d21ea39c5eda18 (patch) | |
| tree | 265c0d9a5c6747684353068db9941474c0f92efe /components/script/dom/htmltextareaelement.rs | |
| parent | 19744984da58feeeab64a98839ec2936fb8fb5a0 (diff) | |
| parent | d054946f7d3bf9834a91cdf4ffa9de6f10099ccf (diff) | |
| download | servo-5cb1356e9e3dbde9fd841c9aa2d21ea39c5eda18.tar.gz servo-5cb1356e9e3dbde9fd841c9aa2d21ea39c5eda18.zip | |
Auto merge of #5800 - aweinstock314:x11-clipboard, r=jdm
...ed test_clipboard_paste to the "test-unit" suite.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5800)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmltextareaelement.rs')
| -rw-r--r-- | components/script/dom/htmltextareaelement.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index d3e08c2092e..dc2f89c6122 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -30,6 +30,7 @@ use textinput::{TextInput, Lines, KeyReaction}; use dom::virtualmethods::VirtualMethods; use dom::window::WindowHelpers; use script_task::{ScriptMsg, Runnable}; +use msg::constellation_msg::ConstellationChan; use util::str::DOMString; use string_cache::Atom; @@ -40,7 +41,7 @@ use std::cell::Cell; #[dom_struct] pub struct HTMLTextAreaElement { htmlelement: HTMLElement, - textinput: DOMRefCell<TextInput>, + textinput: DOMRefCell<TextInput<ConstellationChan>>, cols: Cell<u32>, rows: Cell<u32>, // https://html.spec.whatwg.org/multipage/#concept-textarea-dirty @@ -95,7 +96,7 @@ impl HTMLTextAreaElement { let chan = document.window().root().r().constellation_chan(); HTMLTextAreaElement { htmlelement: HTMLElement::new_inherited(HTMLElementTypeId::HTMLTextAreaElement, localName, prefix, document), - textinput: DOMRefCell::new(TextInput::new(Lines::Multiple, "".to_owned(), Some(chan))), + textinput: DOMRefCell::new(TextInput::new(Lines::Multiple, "".to_owned(), chan)), cols: Cell::new(DEFAULT_COLS), rows: Cell::new(DEFAULT_ROWS), value_changed: Cell::new(false), |