Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-10 09:33:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused arguments from LoadComplete and LoadCompleteMsg

Browse source
This commit is contained in:
Manish Goregaokar 2014-11-14 02:14:00 +05:30
parent d5f1bb2df5
commit cdddf6465c
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/compositing/compositor_task.rs
View file

@ -25,7 +25,6 @@ use servo_util::time::TimeProfilerChan;
use std::comm::{channel, Sender, Receiver}; use std::comm::{channel, Sender, Receiver};
use std::fmt::{FormatError, Formatter, Show}; use std::fmt::{FormatError, Formatter, Show};
use std::rc::Rc; use std::rc::Rc;
use url::Url;
/// Sends messages to the compositor. This is a trait supplied by the port because the method used /// Sends messages to the compositor. This is a trait supplied by the port because the method used
/// to communicate with the compositor may have to kick OS event loops awake, communicate cross- /// to communicate with the compositor may have to kick OS event loops awake, communicate cross-
@ -191,8 +190,8 @@ pub enum Msg {
SetIds(SendableFrameTree, Sender<()>, ConstellationChan), SetIds(SendableFrameTree, Sender<()>, ConstellationChan),
/// Sends an updated version of the frame tree. /// Sends an updated version of the frame tree.
FrameTreeUpdateMsg(FrameTreeDiff, Sender<()>), FrameTreeUpdateMsg(FrameTreeDiff, Sender<()>),
/// The load of a page for a given URL has completed. /// The load of a page has completed.
LoadComplete(PipelineId, Url), LoadComplete,
/// Indicates that the scrolling timeout with the given starting timestamp has happened and a /// Indicates that the scrolling timeout with the given starting timestamp has happened and a
/// composite should happen. (See the `scrolling` module.) /// composite should happen. (See the `scrolling` module.)
ScrollTimeout(u64), ScrollTimeout(u64),
@ -214,7 +213,7 @@ impl Show for Msg {
RenderMsgDiscarded(..) => write!(f, "RenderMsgDiscarded"), RenderMsgDiscarded(..) => write!(f, "RenderMsgDiscarded"),
SetIds(..) => write!(f, "SetIds"), SetIds(..) => write!(f, "SetIds"),
FrameTreeUpdateMsg(..) => write!(f, "FrameTreeUpdateMsg"), FrameTreeUpdateMsg(..) => write!(f, "FrameTreeUpdateMsg"),
LoadComplete(..) => write!(f, "LoadComplete"), LoadComplete => write!(f, "LoadComplete"),
ScrollTimeout(..) => write!(f, "ScrollTimeout"), ScrollTimeout(..) => write!(f, "ScrollTimeout"),
} }
} }

4
components/compositing/constellation.rs
View file

@ -434,9 +434,9 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
} }
// A page loaded through one of several methods above has completed all parsing, // A page loaded through one of several methods above has completed all parsing,
// script, and reflow messages have been sent. // script, and reflow messages have been sent.
LoadCompleteMsg(pipeline_id, url) => { LoadCompleteMsg => {
debug!("constellation got load complete message"); debug!("constellation got load complete message");
self.compositor_proxy.send(LoadComplete(pipeline_id, url)); self.compositor_proxy.send(LoadComplete);
} }
// Handle a forward or back request // Handle a forward or back request
NavigateMsg(direction) => { NavigateMsg(direction) => {

2
components/compositing/headless.rs
View file

@ -104,7 +104,7 @@ impl CompositorEventListener for NullCompositor {
CreateOrUpdateDescendantLayer(..) | CreateOrUpdateDescendantLayer(..) |
SetLayerOrigin(..) | Paint(..) | SetLayerOrigin(..) | Paint(..) |
ChangeReadyState(..) | ChangeRenderState(..) | ScrollFragmentPoint(..) | ChangeReadyState(..) | ChangeRenderState(..) | ScrollFragmentPoint(..) |
LoadComplete(..) | RenderMsgDiscarded(..) | ScrollTimeout(..) => () LoadComplete | RenderMsgDiscarded(..) | ScrollTimeout(..) => ()
} }
true true
} }

2
components/msg/constellation_msg.rs
View file

@ -197,7 +197,7 @@ pub enum Msg {
ExitMsg, ExitMsg,
FailureMsg(Failure), FailureMsg(Failure),
InitLoadUrlMsg(Url), InitLoadUrlMsg(Url),
LoadCompleteMsg(PipelineId, Url), LoadCompleteMsg,
FrameRectMsg(PipelineId, SubpageId, Rect<f32>), FrameRectMsg(PipelineId, SubpageId, Rect<f32>),
LoadUrlMsg(PipelineId, LoadData), LoadUrlMsg(PipelineId, LoadData),
ScriptLoadedURLInIFrameMsg(Url, PipelineId, SubpageId, IFrameSandboxState), ScriptLoadedURLInIFrameMsg(Url, PipelineId, SubpageId, IFrameSandboxState),

4
components/script/script_task.rs
View file

@ -854,10 +854,10 @@ impl ScriptTask {
let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window); let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window);
let _ = wintarget.dispatch_event_with_target(Some(doctarget), *event); let _ = wintarget.dispatch_event_with_target(Some(doctarget), *event);
*page.fragment_name.borrow_mut() = url.fragment.clone(); *page.fragment_name.borrow_mut() = url.fragment;
let ConstellationChan(ref chan) = self.constellation_chan; let ConstellationChan(ref chan) = self.constellation_chan;
chan.send(LoadCompleteMsg(page.id, url)); chan.send(LoadCompleteMsg);
} }
fn scroll_fragment_point(&self, pipeline_id: PipelineId, node: JSRef<Element>) { fn scroll_fragment_point(&self, pipeline_id: PipelineId, node: JSRef<Element>) {