mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Remove ScriptMsg::Navigate (fixes #4948).
This commit is contained in:
parent
cbc4b9520e
commit
d7fab117c2
1 changed files with 1 additions and 13 deletions
|
@ -50,7 +50,7 @@ use script_traits::ScriptTaskFactory;
|
||||||
use msg::compositor_msg::ReadyState::{FinishedLoading, Loading, PerformingLayout};
|
use msg::compositor_msg::ReadyState::{FinishedLoading, Loading, PerformingLayout};
|
||||||
use msg::compositor_msg::{LayerId, ScriptListener};
|
use msg::compositor_msg::{LayerId, ScriptListener};
|
||||||
use msg::constellation_msg::{ConstellationChan};
|
use msg::constellation_msg::{ConstellationChan};
|
||||||
use msg::constellation_msg::{LoadData, NavigationDirection, PipelineId, SubpageId};
|
use msg::constellation_msg::{LoadData, PipelineId, SubpageId};
|
||||||
use msg::constellation_msg::{Failure, Msg, WindowSizeData, Key, KeyState};
|
use msg::constellation_msg::{Failure, Msg, WindowSizeData, Key, KeyState};
|
||||||
use msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
|
use msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
|
||||||
use msg::constellation_msg::{PipelineExitType};
|
use msg::constellation_msg::{PipelineExitType};
|
||||||
|
@ -108,9 +108,6 @@ pub enum ScriptMsg {
|
||||||
/// Begins a content-initiated load on the specified pipeline (only
|
/// Begins a content-initiated load on the specified pipeline (only
|
||||||
/// dispatched to ScriptTask).
|
/// dispatched to ScriptTask).
|
||||||
TriggerLoad(PipelineId, LoadData),
|
TriggerLoad(PipelineId, LoadData),
|
||||||
/// Instructs the script task to send a navigate message to
|
|
||||||
/// the constellation (only dispatched to ScriptTask).
|
|
||||||
Navigate(NavigationDirection),
|
|
||||||
/// Fires a JavaScript timeout
|
/// Fires a JavaScript timeout
|
||||||
/// TimerSource must be FromWindow when dispatched to ScriptTask and
|
/// TimerSource must be FromWindow when dispatched to ScriptTask and
|
||||||
/// must be FromWorker when dispatched to a DedicatedGlobalWorkerScope
|
/// must be FromWorker when dispatched to a DedicatedGlobalWorkerScope
|
||||||
|
@ -597,8 +594,6 @@ impl ScriptTask {
|
||||||
self.handle_fire_timer_msg(id, timer_id),
|
self.handle_fire_timer_msg(id, timer_id),
|
||||||
ScriptMsg::FireTimer(TimerSource::FromWorker, _) =>
|
ScriptMsg::FireTimer(TimerSource::FromWorker, _) =>
|
||||||
panic!("Worker timeouts must not be sent to script task"),
|
panic!("Worker timeouts must not be sent to script task"),
|
||||||
ScriptMsg::Navigate(direction) =>
|
|
||||||
self.handle_navigate_msg(direction),
|
|
||||||
ScriptMsg::ExitWindow(id) =>
|
ScriptMsg::ExitWindow(id) =>
|
||||||
self.handle_exit_window_msg(id),
|
self.handle_exit_window_msg(id),
|
||||||
ScriptMsg::DOMMessage(..) =>
|
ScriptMsg::DOMMessage(..) =>
|
||||||
|
@ -703,13 +698,6 @@ impl ScriptTask {
|
||||||
self.compositor.borrow_mut().set_ready_state(pipeline_id, FinishedLoading);
|
self.compositor.borrow_mut().set_ready_state(pipeline_id, FinishedLoading);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Handles a navigate forward or backward message.
|
|
||||||
/// TODO(tkuehn): is it ever possible to navigate only on a subframe?
|
|
||||||
fn handle_navigate_msg(&self, direction: NavigationDirection) {
|
|
||||||
let ConstellationChan(ref chan) = self.constellation_chan;
|
|
||||||
chan.send(ConstellationMsg::Navigate(direction)).unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Window was resized, but this script was not active, so don't reflow yet
|
/// Window was resized, but this script was not active, so don't reflow yet
|
||||||
fn handle_resize_inactive_msg(&self, id: PipelineId, new_size: WindowSizeData) {
|
fn handle_resize_inactive_msg(&self, id: PipelineId, new_size: WindowSizeData) {
|
||||||
let page = self.page.borrow_mut();
|
let page = self.page.borrow_mut();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue