diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-16 23:51:49 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-16 23:51:49 -0600 |
| commit | b4b2c63c11a38ebda3eb3235af6ffa2413a73cf1 (patch) | |
| tree | d453a34df5f8888eb131274ec5567cd0253cedb0 /components/script | |
| parent | 2281bca89252d8e37771ce2446fb5871a69903d0 (diff) | |
| parent | 84c5db900f5b7253efcadb0b9f1e0cc052500674 (diff) | |
| download | servo-b4b2c63c11a38ebda3eb3235af6ffa2413a73cf1.tar.gz servo-b4b2c63c11a38ebda3eb3235af6ffa2413a73cf1.zip | |
auto merge of #5248 : glennw/servo/fix-subpage-reflow, r=jdm
Otherwise, the new iframe may not get a valid window size until the parent frame does another reflow.
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/script_task.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index c8873387d5d..02c504804ce 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -1148,7 +1148,9 @@ impl ScriptTask { .find(|node| node.subpage_id() == Some(subpage_id)) .map(Temporary::from_rooted) }).root(); - iframe.r().unwrap().navigate_child_browsing_context(load_data.url); + if let Some(iframe) = iframe.r() { + iframe.navigate_child_browsing_context(load_data.url); + } } None => { let ConstellationChan(ref const_chan) = self.constellation_chan; |