diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-10 18:12:47 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-10 18:12:47 -0600 |
| commit | e581648c75a55a5939a16f4089295154e38dbc23 (patch) | |
| tree | 8d103afbbc7b68f211cf639289157382c8f7ea40 /components/compositing/constellation.rs | |
| parent | 19827658deaf21eb811203f89c78a0f99e631ad4 (diff) | |
| parent | 3befc8ce0b331f7ca2d594c2bbf6c593f985196b (diff) | |
| download | servo-e581648c75a55a5939a16f4089295154e38dbc23.tar.gz servo-e581648c75a55a5939a16f4089295154e38dbc23.zip | |
auto merge of #5189 : glennw/servo/page-url, r=larsbergstrom
This doesn't have any effect on functionality, it just simplifies a few upcoming changes with how FrameIds work.
Diffstat (limited to 'components/compositing/constellation.rs')
| -rw-r--r-- | components/compositing/constellation.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index aff40db788d..3def1896346 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -335,7 +335,7 @@ impl NavigationContext { fn set_current(&mut self, new_frame: Rc<FrameTree>, compositor_proxy: &mut CompositorProxy) { self.current = Some(new_frame.clone()); compositor_proxy.send(CompositorMsg::ChangePageUrl( - new_frame.id, + new_frame.pipeline.borrow().id, new_frame.pipeline.borrow().url.clone())); } } |