mirror of
https://github.com/servo/servo.git
synced 2025-07-22 06:43:40 +01:00
Reduce channel cloning.
This commit is contained in:
parent
207be7d2e2
commit
897be5f6ee
13 changed files with 38 additions and 38 deletions
|
@ -124,7 +124,7 @@ impl HTMLIFrameElement {
|
|||
let new_pipeline_id = self.pipeline_id.get().unwrap();
|
||||
let private_iframe = self.privatebrowsing();
|
||||
|
||||
let ConstellationChan(ref chan) = window.constellation_chan();
|
||||
let ConstellationChan(ref chan) = *window.constellation_chan();
|
||||
let load_info = IFrameLoadInfo {
|
||||
url: url,
|
||||
containing_pipeline_id: window.pipeline(),
|
||||
|
@ -371,7 +371,7 @@ pub fn Navigate(iframe: &HTMLIFrameElement, direction: NavigationDirection) -> E
|
|||
|
||||
let pipeline_info = Some((window.pipeline(),
|
||||
iframe.subpage_id().unwrap()));
|
||||
let ConstellationChan(ref chan) = window.constellation_chan();
|
||||
let ConstellationChan(ref chan) = *window.constellation_chan();
|
||||
let msg = ConstellationMsg::Navigate(pipeline_info, direction);
|
||||
chan.send(msg).unwrap();
|
||||
}
|
||||
|
@ -575,7 +575,7 @@ impl VirtualMethods for HTMLIFrameElement {
|
|||
//
|
||||
// Since most of this cleanup doesn't happen on same-origin
|
||||
// iframes, and since that would cause a deadlock, don't do it.
|
||||
let ConstellationChan(ref chan) = window.constellation_chan();
|
||||
let ConstellationChan(ref chan) = *window.constellation_chan();
|
||||
let same_origin = if let Some(self_url) = self.get_url() {
|
||||
let win_url = window_from_node(self).get_url();
|
||||
UrlHelper::SameOrigin(&self_url, &win_url)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue