diff options
| author | Alan Jeffrey <ajeffrey@mozilla.com> | 2017-01-31 08:56:38 -0600 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2017-02-16 16:45:29 -0600 |
| commit | e8d765557f2ef1a298eed6d4234e74ba45333a44 (patch) | |
| tree | e48cf428a48b3ad48c10a40bbb3111af0009d1c3 /components/script/script_thread.rs | |
| parent | 4a0b730cafd09fbd6e5cbc00727caef9b3cae315 (diff) | |
| download | servo-e8d765557f2ef1a298eed6d4234e74ba45333a44.tar.gz servo-e8d765557f2ef1a298eed6d4234e74ba45333a44.zip | |
Allow browsing contexts to resolve to cross-origin windows.
Diffstat (limited to 'components/script/script_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index fa83eaed631..ac093a7a5df 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -1678,7 +1678,7 @@ impl ScriptThread { }, hash_map::Entry::Occupied(entry) => { let browsing_context = entry.get(); - browsing_context.set_window_proxy(&window); + browsing_context.set_currently_active(&*window); window.init_browsing_context(browsing_context); }, } @@ -1782,7 +1782,9 @@ impl ScriptThread { ServoParser::parse_html_document(&document, parse_input, final_url); } - if incomplete.activity != DocumentActivity::FullyActive { + if incomplete.activity == DocumentActivity::FullyActive { + window.resume(); + } else { window.suspend(); } |