From e265b6b15b70ccf85f9e2f038be7ca8f913ea69f Mon Sep 17 00:00:00 2001
From: Glenn Watson <gw@intuitionlibrary.com>
Date: Wed, 11 Mar 2015 14:13:30 +1000
Subject: Remove unused subpage field from page

---
 components/script/page.rs        | 8 ++------
 components/script/script_task.rs | 3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'components/script')

diff --git a/components/script/page.rs b/components/script/page.rs
index ffaa25c9e14..cea2ddefc27 100644
--- a/components/script/page.rs
+++ b/components/script/page.rs
@@ -8,7 +8,7 @@ use dom::document::{Document, DocumentHelpers};
 use dom::node::NodeHelpers;
 use dom::window::Window;
 
-use msg::constellation_msg::{PipelineId, SubpageId};
+use msg::constellation_msg::PipelineId;
 use util::smallvec::SmallVec;
 use std::cell::Cell;
 use std::rc::Rc;
@@ -20,9 +20,6 @@ pub struct Page {
     /// Pipeline id associated with this page.
     id: PipelineId,
 
-    /// Subpage id associated with this page, if any.
-    subpage_id: Option<SubpageId>,
-
     /// The outermost frame containing the document and window.
     frame: DOMRefCell<Option<Frame>>,
 
@@ -65,10 +62,9 @@ impl IterablePage for Rc<Page> {
 }
 
 impl Page {
-    pub fn new(id: PipelineId, subpage_id: Option<SubpageId>, url: Url) -> Page {
+    pub fn new(id: PipelineId, url: Url) -> Page {
         Page {
             id: id,
-            subpage_id: subpage_id,
             frame: DOMRefCell::new(None),
             url: url,
             needs_reflow: Cell::new(true),
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index deffe3e8f66..e5d24cfffbe 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -909,8 +909,7 @@ impl ScriptTask {
         let cx = cx.as_ref().unwrap();
 
         // Create a new frame tree entry.
-        let page = Rc::new(Page::new(incomplete.pipeline_id, incomplete.subpage_id.map(|p| p.1),
-                                     final_url.clone()));
+        let page = Rc::new(Page::new(incomplete.pipeline_id, final_url.clone()));
         if !root_page_exists {
             // We have a new root frame tree.
             *self.page.borrow_mut() = Some(page.clone());
-- 
cgit v1.2.3