diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-17 19:45:44 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-17 19:45:44 +0530 |
| commit | 9570b51565c3864e76570f41a45f3b94c002e50c (patch) | |
| tree | 21036322c5e5f308b8729c3b6ba1eb9c92bd919e /components/script/script_task.rs | |
| parent | c6ae32abdde715dbdc3097a40ab7abdbc98cf4b0 (diff) | |
| parent | 2a86f9d165f2c6482fcbe093f3029f09ae2b1232 (diff) | |
| download | servo-9570b51565c3864e76570f41a45f3b94c002e50c.tar.gz servo-9570b51565c3864e76570f41a45f3b94c002e50c.zip | |
Auto merge of #8618 - paulrouget:reload, r=jdm
Browser API: implement iframe.reload()
fixes #8575
The implementation is naive, and doesn't support the `hardreload` parameter.
And for the test, I'm not sure how else I can test the reload.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8618)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index a3cff5b0835..04500ac5738 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -1922,7 +1922,7 @@ impl ScriptTask { doc.find_iframe(subpage_id) }); if let Some(iframe) = iframe.r() { - iframe.navigate_child_browsing_context(load_data.url); + iframe.navigate_or_reload_child_browsing_context(Some(load_data.url)); } } None => { |