diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-07-31 14:42:29 -0700 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-07-31 14:42:29 -0700 |
| commit | feee4ddcb23a072e60bfe76cbaa738215e065ad6 (patch) | |
| tree | 629208c8bce64ff9d1837d726a62c5a4cf609d13 /src/components/script/dom/element.rs | |
| parent | 7911ae56954cc0ff03f77ff901233a411a30f1e7 (diff) | |
| parent | 8eac64b0aec9dcec3e79e292487e7759ebe1d189 (diff) | |
| download | servo-feee4ddcb23a072e60bfe76cbaa738215e065ad6.tar.gz servo-feee4ddcb23a072e60bfe76cbaa738215e065ad6.zip | |
auto merge of #647 : tkuehn/servo/master, r=metajack
This will be necessary for the constellation to properly assign sizes to iframes when a parent layout performs reflow.
Diffstat (limited to 'src/components/script/dom/element.rs')
| -rw-r--r-- | src/components/script/dom/element.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 7f42230b61b..ac60914db1c 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -18,6 +18,8 @@ use std::str::eq_slice; use extra::net::url::Url; use geom::size::Size2D; +use servo_msg::constellation_msg::SubpageId; + pub struct Element { parent: Node<ScriptView>, tag_name: ~str, // TODO: This should be an atom, not a ~str. @@ -112,6 +114,7 @@ pub struct HTMLHeadingElement { pub struct HTMLIframeElement { parent: Element, frame: Option<Url>, + subpage_id: Option<SubpageId>, size_future_chan: Option<ChanOne<Size2D<uint>>>, } |