Split Page code out of script_task.rs #2530

servo · Jun 13, 2014 · 94ec3cd · 94ec3cd · bors-servo · Jun 13, 2014
1 parent 4c5437c
commit 94ec3cd
Show file tree

Hide file tree

Showing 8 changed files with 455 additions and 418 deletions.
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4339,7 +4339,7 @@ def __init__(self, config, prefix, webIDLFile):
             'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}',
             'dom::bindings::proxyhandler::{getPropertyDescriptor}',
             'dom::bindings::str::ByteString',
-            'script_task::JSPageInfo',
+            'page::JSPageInfo',
             'libc',
             'servo_util::str::DOMString',
             'std::mem',
@@ -5214,7 +5214,7 @@ def RegisterBindings(config):
             'dom::bindings::codegen',
             'dom::bindings::js::{JS, JSRef}',
             'dom::window::Window',
-            'script_task::JSPageInfo',
+            'page::JSPageInfo',
         ])
 
     @staticmethod

diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs
@@ -14,7 +14,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use dom::window::Window;
-use script_task::IterablePage;
+use page::IterablePage;
 use servo_msg::constellation_msg::{PipelineId, SubpageId};
 use servo_msg::constellation_msg::{IFrameSandboxed, IFrameUnsandboxed};
 use servo_msg::constellation_msg::{ConstellationChan, LoadIframeUrlMsg};

diff --git a/src/components/script/dom/location.rs b/src/components/script/dom/location.rs
@@ -8,7 +8,7 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::window::Window;
 use servo_util::str::DOMString;
 
-use script_task::{Page};
+use page::Page;
 use std::rc::Rc;
 
 use serialize::{Encoder, Encodable};

diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
@@ -17,7 +17,8 @@ use dom::navigator::Navigator;
 use dom::performance::Performance;
 
 use layout_interface::{ReflowForDisplay, DocumentDamageLevel};
-use script_task::{ExitWindowMsg, FireTimerMsg, Page, ScriptChan, TriggerLoadMsg, TriggerFragmentMsg};
+use page::Page;
+use script_task::{ExitWindowMsg, FireTimerMsg, ScriptChan, TriggerLoadMsg, TriggerFragmentMsg};
 use servo_msg::compositor_msg::ScriptListener;
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_util::str::DOMString;

diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
@@ -14,7 +14,7 @@ use dom::htmlformelement::HTMLFormElement;
 use dom::node::{ElementNodeTypeId, NodeHelpers, NodeMethods};
 use dom::types::*;
 use html::cssparse::{StylesheetProvenance, UrlProvenance, spawn_css_parser};
-use script_task::Page;
+use page::Page;
 
 use hubbub::hubbub;
 use hubbub::hubbub::{NullNs, HtmlNs, MathMlNs, SvgNs, XLinkNs, XmlNs, XmlNsNs};