aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-02-12 10:18:45 -0700
committerbors-servo <metajack+bors@gmail.com>2015-02-12 10:18:45 -0700
commit29d24a5049cda10111bb36f3ca2d798e68137107 (patch)
tree5dcb96239d4a52a48dd817ef132cfea4b5df0590 /components/script/script_task.rs
parent395323cd70cad05f43617e9ef95f4db71df05d71 (diff)
parent3e33a0b63374f952e2c7a3ddb53bd4548e708f2d (diff)
downloadservo-29d24a5049cda10111bb36f3ca2d798e68137107.tar.gz
servo-29d24a5049cda10111bb36f3ca2d798e68137107.zip
auto merge of #4866 : KiChjang/servo/trigger-fragment-string, r=jdm
Fixes #4863
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 6a261e5c128..7e9269442e1 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -109,7 +109,7 @@ pub trait Runnable {
pub enum ScriptMsg {
/// Acts on a fragment URL load on the specified pipeline (only dispatched
/// to ScriptTask).
- TriggerFragment(PipelineId, Url),
+ TriggerFragment(PipelineId, String),
/// Begins a content-initiated load on the specified pipeline (only
/// dispatched to ScriptTask).
TriggerLoad(PipelineId, LoadData),
@@ -610,8 +610,8 @@ impl ScriptTask {
match msg {
ScriptMsg::TriggerLoad(id, load_data) =>
self.trigger_load(id, load_data),
- ScriptMsg::TriggerFragment(id, url) =>
- self.trigger_fragment(id, url),
+ ScriptMsg::TriggerFragment(id, fragment) =>
+ self.trigger_fragment(id, fragment),
ScriptMsg::FireTimer(TimerSource::FromWindow(id), timer_id) =>
self.handle_fire_timer_msg(id, timer_id),
ScriptMsg::FireTimer(TimerSource::FromWorker, _) =>
@@ -1113,9 +1113,9 @@ impl ScriptTask {
/// The entry point for content to notify that a fragment url has been requested
/// for the given pipeline.
- fn trigger_fragment(&self, pipeline_id: PipelineId, url: Url) {
+ fn trigger_fragment(&self, pipeline_id: PipelineId, fragment: String) {
let page = get_page(&*self.page.borrow(), pipeline_id);
- match page.find_fragment_node(url.fragment.unwrap()).root() {
+ match page.find_fragment_node(fragment).root() {
Some(node) => {
self.scroll_fragment_point(pipeline_id, node.r());
}