Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #5189 : glennw/servo/page-url, r=larsbergstrom

Browse source 
This doesn't have any effect on functionality, it just simplifies a few upcoming changes with how FrameIds work.
This commit is contained in:
bors-servo 2015-03-10 18:12:47 -06:00
commit e581648c75
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/compositing/compositor.rs
View file

@ -5,7 +5,7 @@
use compositor_layer::{CompositorData, CompositorLayer, WantsScrollEventsFlag}; use compositor_layer::{CompositorData, CompositorLayer, WantsScrollEventsFlag};
use compositor_task::{CompositorEventListener, CompositorProxy, CompositorReceiver}; use compositor_task::{CompositorEventListener, CompositorProxy, CompositorReceiver};
use compositor_task::{CompositorTask, LayerProperties, Msg}; use compositor_task::{CompositorTask, LayerProperties, Msg};
use constellation::{FrameId, SendableFrameTree}; use constellation::SendableFrameTree;
use pipeline::CompositionPipeline; use pipeline::CompositionPipeline;
use scrolling::ScrollingTimerProxy; use scrolling::ScrollingTimerProxy;
use windowing; use windowing;
@ -274,8 +274,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.change_page_title(pipeline_id, title); self.change_page_title(pipeline_id, title);
} }
(Msg::ChangePageUrl(frame_id, url), ShutdownState::NotShuttingDown) => { (Msg::ChangePageUrl(pipeline_id, url), ShutdownState::NotShuttingDown) => {
self.change_page_url(frame_id, url); self.change_page_url(pipeline_id, url);
} }
(Msg::PaintMsgDiscarded, ShutdownState::NotShuttingDown) => { (Msg::PaintMsgDiscarded, ShutdownState::NotShuttingDown) => {
@ -441,7 +441,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
} }
fn change_page_url(&mut self, _: FrameId, url: Url) { fn change_page_url(&mut self, _: PipelineId, url: Url) {
self.window.set_page_url(url); self.window.set_page_url(url);
} }

2
components/compositing/compositor_task.rs
View file

@ -202,7 +202,7 @@ pub enum Msg {
/// Alerts the compositor that the current page has changed its title. /// Alerts the compositor that the current page has changed its title.
ChangePageTitle(PipelineId, Option<String>), ChangePageTitle(PipelineId, Option<String>),
/// Alerts the compositor that the current page has changed its URL. /// Alerts the compositor that the current page has changed its URL.
ChangePageUrl(FrameId, Url), ChangePageUrl(PipelineId, Url),
/// Alerts the compositor that a `PaintMsg` has been discarded. /// Alerts the compositor that a `PaintMsg` has been discarded.
PaintMsgDiscarded, PaintMsgDiscarded,
/// Replaces the current frame tree, typically called during main frame navigation. /// Replaces the current frame tree, typically called during main frame navigation.

2
components/compositing/constellation.rs
View file

@ -335,7 +335,7 @@ impl NavigationContext {
fn set_current(&mut self, new_frame: Rc<FrameTree>, compositor_proxy: &mut CompositorProxy) { fn set_current(&mut self, new_frame: Rc<FrameTree>, compositor_proxy: &mut CompositorProxy) {
self.current = Some(new_frame.clone()); self.current = Some(new_frame.clone());
compositor_proxy.send(CompositorMsg::ChangePageUrl( compositor_proxy.send(CompositorMsg::ChangePageUrl(
new_frame.id, new_frame.pipeline.borrow().id,
new_frame.pipeline.borrow().url.clone())); new_frame.pipeline.borrow().url.clone()));
} }
} }