diff options
Diffstat (limited to 'components/script')
131 files changed, 435 insertions, 435 deletions
diff --git a/components/script/cors.rs b/components/script/cors.rs index 108f37790a3..587cdaacf87 100644 --- a/components/script/cors.rs +++ b/components/script/cors.rs @@ -9,9 +9,9 @@ //! This library will eventually become the core of the Fetch crate //! with CORSRequest being expanded into FetchRequest (etc) +use net_traits::{AsyncResponseListener, ResponseAction, Metadata}; use network_listener::{NetworkListener, PreInvoke}; use script_task::ScriptChan; -use net_traits::{AsyncResponseListener, ResponseAction, Metadata}; use std::ascii::AsciiExt; use std::borrow::ToOwned; @@ -20,14 +20,14 @@ use std::sync::{Arc, Mutex}; use time; use time::{now, Timespec}; -use hyper::header::{AccessControlRequestMethod, AccessControlAllowMethods}; +use hyper::client::Request; use hyper::header::{AccessControlMaxAge, AccessControlAllowOrigin}; use hyper::header::{AccessControlRequestHeaders, AccessControlAllowHeaders}; -use hyper::header::{Headers, HeaderView}; -use hyper::client::Request; -use hyper::mime::{Mime, TopLevel, SubLevel}; +use hyper::header::{AccessControlRequestMethod, AccessControlAllowMethods}; use hyper::header::{ContentType, Host}; +use hyper::header::{Headers, HeaderView}; use hyper::method::Method; +use hyper::mime::{Mime, TopLevel, SubLevel}; use hyper::status::StatusClass::Success; use unicase::UniCase; diff --git a/components/script/devtools.rs b/components/script/devtools.rs index 25a0da81a40..d2feb56674e 100644 --- a/components/script/devtools.rs +++ b/components/script/devtools.rs @@ -3,25 +3,25 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use devtools_traits::{CachedConsoleMessage, CachedConsoleMessageTypes, PAGE_ERROR, CONSOLE_API}; -use devtools_traits::{EvaluateJSReply, NodeInfo, Modification, TimelineMarker, TimelineMarkerType}; use devtools_traits::{ConsoleAPI, PageError, ScriptToDevtoolsControlMsg, ComputedNodeLayout}; -use dom::bindings::conversions::jsstring_to_str; -use dom::bindings::conversions::FromJSValConvertible; -use dom::bindings::js::Root; -use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast}; -use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; +use devtools_traits::{EvaluateJSReply, NodeInfo, Modification, TimelineMarker, TimelineMarkerType}; use dom::bindings::codegen::Bindings::DOMRectBinding::{DOMRectMethods}; +use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::ElementBinding::{ElementMethods}; +use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast}; +use dom::bindings::conversions::FromJSValConvertible; +use dom::bindings::conversions::jsstring_to_str; use dom::bindings::global::GlobalRef; +use dom::bindings::js::Root; +use dom::document::DocumentHelpers; use dom::node::{Node, NodeHelpers}; use dom::window::{WindowHelpers, ScriptHelpers}; -use dom::document::DocumentHelpers; -use page::{IterablePage, Page}; use ipc_channel::ipc::IpcSender; -use msg::constellation_msg::PipelineId; -use script_task::{get_page, ScriptTask}; use js::jsapi::{ObjectClassName, RootedObject, RootedValue}; use js::jsval::UndefinedValue; +use msg::constellation_msg::PipelineId; +use page::{IterablePage, Page}; +use script_task::{get_page, ScriptTask}; use std::ffi::CStr; use std::rc::Rc; use std::str; diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs index 8a062548852..6ea7767bfab 100644 --- a/components/script/document_loader.rs +++ b/components/script/document_loader.rs @@ -5,10 +5,10 @@ //! Tracking of pending loads in a document. //! https://html.spec.whatwg.org/multipage/#the-end -use script_task::MainThreadScriptMsg; use msg::constellation_msg::{PipelineId}; -use net_traits::{Metadata, load_whole_resource, ResourceTask, PendingAsyncLoad}; use net_traits::AsyncResponseTarget; +use net_traits::{Metadata, load_whole_resource, ResourceTask, PendingAsyncLoad}; +use script_task::MainThreadScriptMsg; use std::sync::Arc; use std::sync::mpsc::Sender; use url::Url; diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index 06950a515b0..3df9265580e 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -10,8 +10,8 @@ use dom::bindings::js::{JS, MutNullableHeap}; use dom::bindings::js::{Root, RootedReference, LayoutJS}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::element::{Element, AttributeHandlers}; -use dom::window::Window; use dom::virtualmethods::vtable_for; +use dom::window::Window; use devtools_traits::AttrInfo; use util::str::{DOMString, parse_unsigned_integer, split_html_space_chars, str_join}; diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs index 905901e3870..e5a887a88b0 100644 --- a/components/script/dom/bindings/callback.rs +++ b/components/script/dom/bindings/callback.rs @@ -7,21 +7,21 @@ use dom::bindings::error::{Fallible, Error}; use dom::bindings::global::global_object_for_js_object; use dom::bindings::utils::Reflectable; -use js::jsapi::{JSContext, JSObject, JS_WrapObject, IsCallable}; -use js::jsapi::{JS_GetProperty, JS_IsExceptionPending, JS_ReportPendingException}; -use js::jsapi::{RootedObject, RootedValue, MutableHandleObject, Heap}; +use js::jsapi::GetGlobalForObjectCrossCompartment; use js::jsapi::{JSAutoCompartment}; +use js::jsapi::{JSContext, JSObject, JS_WrapObject, IsCallable}; use js::jsapi::{JS_BeginRequest, JS_EndRequest}; use js::jsapi::{JS_EnterCompartment, JS_LeaveCompartment, JSCompartment}; -use js::jsapi::GetGlobalForObjectCrossCompartment; +use js::jsapi::{JS_GetProperty, JS_IsExceptionPending, JS_ReportPendingException}; use js::jsapi::{JS_SaveFrameChain, JS_RestoreFrameChain}; +use js::jsapi::{RootedObject, RootedValue, MutableHandleObject, Heap}; use js::jsval::{JSVal, UndefinedValue}; +use std::default::Default; use std::ffi::CString; +use std::intrinsics::return_address; use std::ptr; use std::rc::Rc; -use std::intrinsics::return_address; -use std::default::Default; /// The exception handling used for a call. #[derive(Copy, Clone, PartialEq)] diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index d1508060648..ca0e40241be 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -43,26 +43,26 @@ use util::str::DOMString; use js; use js::glue::{GetProxyPrivate, IsWrapper, RUST_JS_NumberValue}; use js::glue::{RUST_JSID_IS_STRING, RUST_JSID_TO_STRING, UnwrapObject}; -use js::rust::{ToUint64, ToInt64}; -use js::rust::{ToUint32, ToInt32}; -use js::rust::{ToUint16, ToNumber, ToBoolean, ToString}; use js::jsapi::{HandleId, HandleObject, HandleValue, JS_GetClass}; +use js::jsapi::{JSClass, JSContext, JSObject, JSString, MutableHandleValue}; use js::jsapi::{JS_GetLatin1StringCharsAndLength, JS_GetReservedSlot}; use js::jsapi::{JS_GetTwoByteStringCharsAndLength, JS_NewStringCopyN}; use js::jsapi::{JS_NewUCStringCopyN, JS_StringHasLatin1Chars, JS_WrapValue}; -use js::jsapi::{JSClass, JSContext, JSObject, JSString, MutableHandleValue}; use js::jsval::JSVal; -use js::jsval::{UndefinedValue, NullValue, BooleanValue, Int32Value, UInt32Value}; use js::jsval::{StringValue, ObjectValue, ObjectOrNullValue}; +use js::jsval::{UndefinedValue, NullValue, BooleanValue, Int32Value, UInt32Value}; +use js::rust::{ToUint16, ToNumber, ToBoolean, ToString}; +use js::rust::{ToUint32, ToInt32}; +use js::rust::{ToUint64, ToInt64}; +use core::nonzero::NonZero; use libc; use num::Float; use num::traits::{Bounded, Zero}; use std::borrow::ToOwned; -use std::slice; use std::ptr; use std::rc::Rc; -use core::nonzero::NonZero; +use std::slice; trait As<O>: Copy { fn cast(self) -> O; diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs index 023254d55a5..a5fb6d90e51 100644 --- a/components/script/dom/bindings/error.rs +++ b/components/script/dom/bindings/error.rs @@ -12,17 +12,17 @@ use dom::domexception::{DOMException, DOMErrorName}; use util::mem::HeapSizeOf; use util::str::DOMString; +use js::jsapi::JSAutoCompartment; use js::jsapi::{JSContext, JSObject, RootedValue}; use js::jsapi::{JS_IsExceptionPending, JS_SetPendingException, JS_ReportPendingException}; use js::jsapi::{JS_ReportErrorNumber1, JSErrorFormatString, JSExnType}; use js::jsapi::{JS_SaveFrameChain, JS_RestoreFrameChain}; -use js::jsapi::JSAutoCompartment; use js::jsval::UndefinedValue; use libc; use std::ffi::CString; -use std::ptr; use std::mem; +use std::ptr; /// DOM exceptions that can be thrown by a native DOM method. #[derive(Debug, Clone, HeapSizeOf)] diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs index 75664ae3be9..2a9ee12e3a2 100644 --- a/components/script/dom/bindings/global.rs +++ b/components/script/dom/bindings/global.rs @@ -7,14 +7,14 @@ //! This module contains smart pointers to global scopes, to simplify writing //! code that works in workers as well as window scopes. +use devtools_traits::ScriptToDevtoolsControlMsg; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::conversions::native_from_reflector_jsmanaged; use dom::bindings::js::{JS, Root}; use dom::bindings::utils::{Reflectable, Reflector}; use dom::document::DocumentHelpers; -use dom::workerglobalscope::{WorkerGlobalScope, WorkerGlobalScopeHelpers}; use dom::window::{self, WindowHelpers, ScriptHelpers}; -use devtools_traits::ScriptToDevtoolsControlMsg; +use dom::workerglobalscope::{WorkerGlobalScope, WorkerGlobalScopeHelpers}; use script_task::{ScriptChan, ScriptPort, CommonScriptMsg, ScriptTask}; use msg::constellation_msg::{ConstellationChan, PipelineId, WorkerId}; @@ -22,9 +22,9 @@ use net_traits::ResourceTask; use profile_traits::mem; use ipc_channel::ipc::IpcSender; -use js::{JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS}; use js::jsapi::{GetGlobalForObjectCrossCompartment}; use js::jsapi::{JSContext, JSObject, JS_GetClass, MutableHandleValue}; +use js::{JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS}; use url::Url; use util::mem::HeapSizeOf; diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs index 5ee6361d6cc..69671a71145 100644 --- a/components/script/dom/bindings/proxyhandler.rs +++ b/components/script/dom/bindings/proxyhandler.rs @@ -8,17 +8,17 @@ use dom::bindings::conversions::is_dom_proxy; use dom::bindings::utils::delete_property_by_id; +use js::glue::GetProxyExtra; +use js::glue::InvokeGetOwnPropertyDescriptor; +use js::glue::{SetProxyExtra, GetProxyHandler}; +use js::jsapi::AutoIdVector; +use js::jsapi::GetObjectProto; +use js::jsapi::{Handle, HandleObject, HandleId, MutableHandle, RootedObject, ObjectOpResult}; use js::jsapi::{JSContext, JSPropertyDescriptor, JSObject}; -use js::jsapi::{JS_GetPropertyDescriptorById}; use js::jsapi::{JS_DefinePropertyById6, JS_NewObjectWithGivenProto}; +use js::jsapi::{JS_GetPropertyDescriptorById}; use js::jsapi::{JS_StrictPropertyStub, JSErrNum}; -use js::jsapi::{Handle, HandleObject, HandleId, MutableHandle, RootedObject, ObjectOpResult}; -use js::jsapi::AutoIdVector; -use js::jsapi::GetObjectProto; use js::jsval::ObjectValue; -use js::glue::GetProxyExtra; -use js::glue::{SetProxyExtra, GetProxyHandler}; -use js::glue::InvokeGetOwnPropertyDescriptor; use js::{JSPROP_GETTER, JSPROP_ENUMERATE, JSPROP_READONLY}; use js::{JSTrue, JSFalse}; diff --git a/components/script/dom/bindings/refcounted.rs b/components/script/dom/bindings/refcounted.rs index 8d1f0876e6b..a1adf059dba 100644 --- a/components/script/dom/bindings/refcounted.rs +++ b/components/script/dom/bindings/refcounted.rs @@ -23,25 +23,25 @@ //! is removed. use dom::bindings::js::Root; -use dom::bindings::utils::{Reflector, Reflectable}; use dom::bindings::trace::trace_reflector; +use dom::bindings::utils::{Reflector, Reflectable}; use script_task::{ScriptChan, CommonScriptMsg}; use js::jsapi::{JSContext, JSTracer}; +use core::nonzero::NonZero; use libc; use std::cell::RefCell; -use std::collections::hash_map::HashMap; use std::collections::hash_map::Entry::{Vacant, Occupied}; +use std::collections::hash_map::HashMap; use std::marker::PhantomData; use std::sync::{Arc, Mutex}; -use core::nonzero::NonZero; #[allow(missing_docs)] // FIXME mod dummy { // Attributes don’t apply through the macro. - use std::rc::Rc; use std::cell::RefCell; + use std::rc::Rc; use super::LiveDOMReferences; thread_local!(pub static LIVE_REFERENCES: Rc<RefCell<Option<LiveDOMReferences>>> = Rc::new(RefCell::new(None))); diff --git a/components/script/dom/bindings/structuredclone.rs b/components/script/dom/bindings/structuredclone.rs index 5697c7eb7dc..60dc10d0ced 100644 --- a/components/script/dom/bindings/structuredclone.rs +++ b/components/script/dom/bindings/structuredclone.rs @@ -5,15 +5,15 @@ //! This module implements structured cloning, as defined by [HTML] //! (https://html.spec.whatwg.org/multipage/#safe-passing-of-structured-data). -use dom::bindings::error::Fallible; use dom::bindings::error::Error::DataClone; +use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use js::glue::JS_STRUCTURED_CLONE_VERSION; use js::jsapi::JSContext; -use js::jsapi::{JS_WriteStructuredClone, JS_ClearPendingException}; use js::jsapi::JS_ReadStructuredClone; use js::jsapi::{HandleValue, MutableHandleValue}; +use js::jsapi::{JS_WriteStructuredClone, JS_ClearPendingException}; use libc::size_t; use std::ptr; diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index d05e099613f..b1dcbbce163 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -34,9 +34,9 @@ use dom::bindings::refcounted::Trusted; use dom::bindings::utils::{Reflectable, Reflector, WindowProxyHandler}; use script_task::ScriptChan; +use canvas_traits::WebGLError; use canvas_traits::{CanvasGradientStop, LinearGradientStyle, RadialGradientStyle}; use canvas_traits::{LineCapStyle, LineJoinStyle, CompositionOrBlending, RepetitionStyle}; -use canvas_traits::WebGLError; use cssparser::RGBA; use encoding::types::EncodingRef; use euclid::matrix2d::Matrix2D; @@ -46,27 +46,26 @@ use html5ever::tree_builder::QuirksMode; use hyper::header::Headers; use hyper::method::Method; use ipc_channel::ipc::{IpcReceiver, IpcSender}; -use js::jsapi::{JSObject, JSTracer, JSGCTraceKind, JS_CallValueTracer, JS_CallObjectTracer, GCTraceKindToAscii, Heap}; use js::jsapi::JS_CallUnbarrieredObjectTracer; +use js::jsapi::{JSObject, JSTracer, JSGCTraceKind, JS_CallValueTracer, JS_CallObjectTracer, GCTraceKindToAscii, Heap}; use js::jsval::JSVal; use js::rust::Runtime; use layout_interface::{LayoutRPC, LayoutChan}; use libc; +use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData, WorkerId}; +use net_traits::image::base::Image; use net_traits::image_cache_task::{ImageCacheChan, ImageCacheTask}; use net_traits::storage_task::StorageType; +use profile_traits::mem::ProfilerChan; use script_traits::UntrustedNodeAddress; +use selectors::parser::PseudoElement; use serde::{Serialize, Deserialize}; use smallvec::SmallVec; -use msg::constellation_msg::ConstellationChan; -use net_traits::image::base::Image; -use profile_traits::mem::ProfilerChan; -use util::str::{LengthOrPercentageOrAuto}; -use selectors::parser::PseudoElement; use std::boxed::FnBox; use std::cell::{Cell, UnsafeCell, RefCell}; -use std::collections::{HashMap, HashSet}; use std::collections::hash_state::HashState; +use std::collections::{HashMap, HashSet}; use std::ffi::CString; use std::hash::{Hash, Hasher}; use std::intrinsics::return_address; @@ -78,6 +77,7 @@ use std::sync::mpsc::{Receiver, Sender}; use string_cache::{Atom, Namespace}; use style::properties::PropertyDeclarationBlock; use url::Url; +use util::str::{LengthOrPercentageOrAuto}; /// A trait to allow tracing (only) DOM objects. @@ -375,8 +375,8 @@ pub struct RootedTraceableSet { #[allow(missing_docs)] // FIXME mod dummy { // Attributes don’t apply through the macro. - use std::rc::Rc; use std::cell::RefCell; + use std::rc::Rc; use super::RootedTraceableSet; /// TLV Holds a set of JSTraceables that need to be rooted thread_local!(pub static ROOTED_TRACEABLES: Rc<RefCell<RootedTraceableSet>> = diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 9f458f83c2e..d7912ae9af4 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -6,11 +6,11 @@ use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; -use dom::bindings::conversions::{is_dom_class, jsstring_to_str}; use dom::bindings::conversions::native_from_handleobject; use dom::bindings::conversions::private_from_proto_chain; -use dom::bindings::error::{Error, ErrorResult, Fallible, throw_invalid_this}; +use dom::bindings::conversions::{is_dom_class, jsstring_to_str}; use dom::bindings::error::throw_type_error; +use dom::bindings::error::{Error, ErrorResult, Fallible, throw_invalid_this}; use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; use dom::bindings::trace::trace_object; @@ -19,46 +19,46 @@ use dom::window; use util::mem::HeapSizeOf; use util::str::DOMString; -use libc; -use libc::c_uint; -use std::ffi::CString; -use std::ptr; -use std::cmp::PartialEq; -use std::default::Default; -use std::cell::UnsafeCell; +use js; use js::glue::{CallJitMethodOp, CallJitGetterOp, CallJitSetterOp, IsWrapper}; use js::glue::{RUST_FUNCTION_VALUE_TO_JITINFO, RUST_JSID_IS_INT}; use js::glue::{RUST_JSID_TO_INT, UnwrapObject}; -use js::jsapi::{CallArgs, GetGlobalForObjectCrossCompartment, JSJitInfo}; +use js::glue::{WrapperNew, GetCrossCompartmentWrapper}; +use js::jsapi::JSAutoCompartment; +use js::jsapi::JS_DeletePropertyById1; +use js::jsapi::JS_GetFunctionObject; use js::jsapi::JS_IsExceptionPending; +use js::jsapi::JS_NewObjectWithUniqueType; +use js::jsapi::JS_ObjectToOuterObject; +use js::jsapi::PropertyDefinitionBehavior; +use js::jsapi::{CallArgs, GetGlobalForObjectCrossCompartment, JSJitInfo}; +use js::jsapi::{DOMCallbacks, JSWrapObjectCallbacks}; +use js::jsapi::{HandleObject, HandleId, HandleValue, MutableHandleValue}; +use js::jsapi::{JSContext, JSObject, JSClass, JSTracer}; +use js::jsapi::{JSFunctionSpec, JSPropertySpec}; use js::jsapi::{JS_AlreadyHasOwnProperty, JS_NewFunction, JSTraceOp}; +use js::jsapi::{JS_DefineFunctions, JS_DefineProperty, JS_DefineProperty1}; use js::jsapi::{JS_DefineProperties, JS_ForwardGetPropertyTo}; +use js::jsapi::{JS_FireOnNewGlobalObject, JSVersion}; use js::jsapi::{JS_GetClass, JS_LinkConstructorAndPrototype}; -use js::jsapi::{HandleObject, HandleId, HandleValue, MutableHandleValue}; -use js::jsapi::JS_GetFunctionObject; -use js::jsapi::{JS_HasPropertyById, JS_GetPrototype}; use js::jsapi::{JS_GetProperty, JS_HasProperty, JS_SetProperty}; -use js::jsapi::{JS_DefineFunctions, JS_DefineProperty, JS_DefineProperty1}; use js::jsapi::{JS_GetReservedSlot, JS_SetReservedSlot}; -use js::jsapi::{JSContext, JSObject, JSClass, JSTracer}; -use js::jsapi::{JSFunctionSpec, JSPropertySpec}; +use js::jsapi::{JS_HasPropertyById, JS_GetPrototype}; use js::jsapi::{JS_NewGlobalObject, JS_InitStandardClasses}; -use js::jsapi::{OnNewGlobalHookOption, CompartmentOptions}; -use js::jsapi::{JS_FireOnNewGlobalObject, JSVersion}; -use js::jsapi::JS_DeletePropertyById1; -use js::jsapi::JS_ObjectToOuterObject; -use js::jsapi::JS_NewObjectWithUniqueType; use js::jsapi::{ObjectOpResult, RootedObject, RootedValue, Heap, MutableHandleObject}; -use js::jsapi::PropertyDefinitionBehavior; -use js::jsapi::JSAutoCompartment; -use js::jsapi::{DOMCallbacks, JSWrapObjectCallbacks}; +use js::jsapi::{OnNewGlobalHookOption, CompartmentOptions}; use js::jsval::{BooleanValue, DoubleValue, Int32Value, JSVal, NullValue}; use js::jsval::{PrivateValue, UInt32Value, UndefinedValue}; use js::rust::{GCMethods, ToString}; -use js::glue::{WrapperNew, GetCrossCompartmentWrapper}; -use js::{JS_CALLEE, JSFUN_CONSTRUCTOR, JSPROP_ENUMERATE}; use js::{JSPROP_PERMANENT, JSPROP_READONLY}; -use js; +use js::{JS_CALLEE, JSFUN_CONSTRUCTOR, JSPROP_ENUMERATE}; +use libc; +use libc::c_uint; +use std::cell::UnsafeCell; +use std::cmp::PartialEq; +use std::default::Default; +use std::ffi::CString; +use std::ptr; use string_cache::{Atom, Namespace}; /// Proxy handler for a WindowProxy. diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index 04f7e782d0e..717d50663ea 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use dom::bindings::codegen::Bindings::BlobBinding; +use dom::bindings::codegen::Bindings::BlobBinding::BlobMethods; use dom::bindings::codegen::InheritTypes::FileDerived; +use dom::bindings::error::Fallible; use dom::bindings::global::{GlobalRef, GlobalField}; use dom::bindings::js::Root; use dom::bindings::utils::{Reflector, reflect_dom_object}; -use dom::bindings::error::Fallible; -use dom::bindings::codegen::Bindings::BlobBinding; -use dom::bindings::codegen::Bindings::BlobBinding::BlobMethods; -use std::sync::mpsc::Sender; -use util::str::DOMString; use num::ToPrimitive; use std::ascii::AsciiExt; use std::borrow::ToOwned; -use std::cmp::{min, max}; use std::cell::{Cell}; +use std::cmp::{min, max}; +use std::sync::mpsc::Sender; +use util::str::DOMString; #[derive(JSTraceable, HeapSizeOf)] pub enum BlobTypeId { diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index bab6ca7a5f2..cdd34ac7c71 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -6,26 +6,26 @@ use dom::bindings::conversions::native_from_handleobject; use dom::bindings::conversions::{ToJSValConvertible}; use dom::bindings::js::{JS, Root}; use dom::bindings::proxyhandler::{get_property_descriptor, fill_property_descriptor}; -use dom::bindings::utils::{Reflectable, WindowProxyHandler}; use dom::bindings::utils::get_array_index_from_id; +use dom::bindings::utils::{Reflectable, WindowProxyHandler}; use dom::document::{Document, DocumentHelpers}; use dom::element::Element; use dom::window::Window; use dom::window::WindowHelpers; -use js::jsapi::{JSContext, JSObject, JSPropertyDescriptor, JSErrNum}; +use js::glue::{GetProxyPrivate}; +use js::glue::{WrapperNew, CreateWrapperProxyHandler, ProxyTraps}; use js::jsapi::{HandleObject, HandleId, MutableHandle, MutableHandleValue}; +use js::jsapi::{JSAutoRequest, JSAutoCompartment}; +use js::jsapi::{JSContext, JSObject, JSPropertyDescriptor, JSErrNum}; use js::jsapi::{JS_AlreadyHasOwnPropertyById, JS_ForwardGetPropertyTo}; -use js::jsapi::{JS_GetPropertyDescriptorById, JS_DefinePropertyById6}; use js::jsapi::{JS_ForwardSetPropertyTo, ObjectOpResult, RootedObject, RootedValue, Handle, HandleValue, Heap}; -use js::jsapi::{JSAutoRequest, JSAutoCompartment}; +use js::jsapi::{JS_GetPropertyDescriptorById, JS_DefinePropertyById6}; use js::jsval::{ObjectValue, UndefinedValue}; -use js::glue::{GetProxyPrivate}; -use js::glue::{WrapperNew, CreateWrapperProxyHandler, ProxyTraps}; use js::{JSTrue, JSFalse}; -use std::ptr; use std::default::Default; +use std::ptr; #[derive(JSTraceable, HeapSizeOf)] #[privatize] diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 14863009b95..9e2ec6d1446 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -29,25 +29,25 @@ use euclid::point::Point2D; use euclid::rect::Rect; use euclid::size::Size2D; +use canvas::canvas_paint_task::RectToi32; use canvas_traits::{CanvasMsg, Canvas2dMsg, CanvasCommonMsg}; use canvas_traits::{FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle, RepetitionStyle}; use canvas_traits::{LineCapStyle, LineJoinStyle, CompositionOrBlending}; -use canvas::canvas_paint_task::RectToi32; use msg::constellation_msg::Msg as ConstellationMsg; -use net_traits::image_cache_task::{ImageCacheChan, ImageResponse}; use net_traits::image::base::PixelFormat; +use net_traits::image_cache_task::{ImageCacheChan, ImageResponse}; use ipc_channel::ipc::{self, IpcSender}; use num::{Float, ToPrimitive}; use std::borrow::ToOwned; use std::cell::RefCell; -use std::fmt; use std::cmp; +use std::fmt; use std::sync::mpsc::channel; -use util::str::DOMString; use url::Url; +use util::str::DOMString; use util::vec::byte_swap; #[must_root] diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index f15b66c68f8..b2d3dfec0cb 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -6,11 +6,11 @@ use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods; -use dom::bindings::codegen::InheritTypes::{CharacterDataDerived, ElementCast}; use dom::bindings::codegen::InheritTypes::NodeCast; +use dom::bindings::codegen::InheritTypes::{CharacterDataDerived, ElementCast}; use dom::bindings::codegen::UnionTypes::NodeOrString; -use dom::bindings::error::{Fallible, ErrorResult}; use dom::bindings::error::Error::IndexSize; +use dom::bindings::error::{Fallible, ErrorResult}; use dom::bindings::js::{LayoutJS, Root}; use dom::document::Document; use dom::element::Element; diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs index 07a6fb39379..a9a6c8e960e 100644 --- a/components/script/dom/closeevent.rs +++ b/components/script/dom/closeevent.rs @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::Bindings::CloseEventBinding; use dom::bindings::codegen::Bindings::CloseEventBinding::CloseEventMethods; +use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::InheritTypes::EventCast; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 0fca952d492..fb0e2ab08f3 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use devtools_traits::{ConsoleMessage, LogLevel, ScriptToDevtoolsControlMsg}; use dom::bindings::codegen::Bindings::ConsoleBinding; use dom::bindings::codegen::Bindings::ConsoleBinding::ConsoleMethods; use dom::bindings::global::{GlobalRef, GlobalField}; use dom::bindings::js::Root; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::window::WindowHelpers; -use devtools_traits::{ConsoleMessage, LogLevel, ScriptToDevtoolsControlMsg}; use util::str::DOMString; // https://developer.mozilla.org/en-US/docs/Web/API/Console diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index c460aa836ae..9b226c73e33 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -30,8 +30,8 @@ use dom::htmlformelement::HTMLFormElement; use dom::htmlframeelement::HTMLFrameElement; use dom::htmlframesetelement::HTMLFrameSetElement; use dom::htmlheadelement::HTMLHeadElement; -use dom::htmlheadingelement::HeadingLevel; use dom::htmlheadingelement::HTMLHeadingElement; +use dom::htmlheadingelement::HeadingLevel; use dom::htmlhrelement::HTMLHRElement; use dom::htmlhtmlelement::HTMLHtmlElement; use dom::htmliframeelement::HTMLIFrameElement; diff --git a/components/script/dom/crypto.rs b/components/script/dom/crypto.rs index 857e220aca1..8764dd900ff 100644 --- a/components/script/dom/crypto.rs +++ b/components/script/dom/crypto.rs @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::CryptoBinding; use dom::bindings::codegen::Bindings::CryptoBinding::CryptoMethods; use dom::bindings::error::{Error, Fallible}; use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; use dom::bindings::utils::{Reflector, reflect_dom_object}; -use dom::bindings::cell::DOMRefCell; use js::jsapi::{JSContext, JSObject}; use js::jsapi::{JS_GetObjectAsArrayBufferView, JS_GetArrayBufferViewType, Type}; diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 4c5fc207674..ff43239644a 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -13,11 +13,11 @@ use dom::element::{ElementHelpers, StylePriority}; use dom::htmlelement::HTMLElement; use dom::node::{window_from_node, document_from_node, NodeDamage, NodeHelpers}; use dom::window::{Window, WindowHelpers}; -use util::str::DOMString; use selectors::parser::PseudoElement; use string_cache::Atom; -use style::properties::{is_supported_property, longhands_from_shorthand, parse_one_declaration}; use style::properties::PropertyDeclaration; +use style::properties::{is_supported_property, longhands_from_shorthand, parse_one_declaration}; +use util::str::DOMString; use std::ascii::AsciiExt; use std::borrow::ToOwned; diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index d72e9243b95..c1e8639d0b3 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -33,8 +33,8 @@ use util::task_state::{SCRIPT, IN_WORKER}; use ipc_channel::ipc::IpcReceiver; use ipc_channel::router::ROUTER; -use js::jsapi::{JSContext, RootedValue, HandleValue}; use js::jsapi::{JSAutoRequest, JSAutoCompartment}; +use js::jsapi::{JSContext, RootedValue, HandleValue}; use js::jsval::UndefinedValue; use js::rust::Runtime; use url::Url; diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index bc1198afac3..78399ac1c2b 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -14,28 +14,28 @@ use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter; use dom::bindings::codegen::Bindings::PerformanceBinding::PerformanceMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; +use dom::bindings::codegen::InheritTypes::ElementDerived; +use dom::bindings::codegen::InheritTypes::HTMLBaseElementCast; use dom::bindings::codegen::InheritTypes::{DocumentDerived, EventCast, HTMLBodyElementCast}; -use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLHeadElementCast, ElementCast, HTMLIFrameElementCast}; use dom::bindings::codegen::InheritTypes::{DocumentTypeCast, HTMLHtmlElementCast, NodeCast}; use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLAnchorElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLAnchorElementDerived, HTMLAppletElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLAreaElementDerived, HTMLEmbedElementDerived}; +use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLHeadElementCast, ElementCast, HTMLIFrameElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLFormElementDerived, HTMLImageElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLScriptElementDerived, HTMLTitleElementDerived}; -use dom::bindings::codegen::InheritTypes::ElementDerived; -use dom::bindings::codegen::InheritTypes::HTMLBaseElementCast; use dom::bindings::codegen::UnionTypes::NodeOrString; -use dom::bindings::error::{ErrorResult, Fallible}; -use dom::bindings::error::Error::{NotSupported, InvalidCharacter, Security}; use dom::bindings::error::Error::HierarchyRequest; +use dom::bindings::error::Error::{NotSupported, InvalidCharacter, Security}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{JS, Root, LayoutJS, MutNullableHeap}; use dom::bindings::js::RootedReference; +use dom::bindings::js::{JS, Root, LayoutJS, MutNullableHeap}; use dom::bindings::refcounted::Trusted; use dom::bindings::trace::RootedVec; +use dom::bindings::utils::XMLName::InvalidXMLName; use dom::bindings::utils::{reflect_dom_object, Reflectable}; use dom::bindings::utils::{xml_name_type, validate_and_extract}; -use dom::bindings::utils::XMLName::InvalidXMLName; use dom::comment::Comment; use dom::customevent::CustomEvent; use dom::documentfragment::DocumentFragment; @@ -53,56 +53,56 @@ use dom::htmlheadelement::HTMLHeadElement; use dom::htmlhtmlelement::HTMLHtmlElement; use dom::htmliframeelement::HTMLIFrameElement; use dom::htmlscriptelement::HTMLScriptElement; -use dom::location::Location; -use dom::mouseevent::MouseEvent; use dom::keyboardevent::KeyboardEvent; +use dom::location::Location; use dom::messageevent::MessageEvent; +use dom::mouseevent::MouseEvent; use dom::node::{self, Node, NodeHelpers, NodeTypeId, CloneChildrenFlag, NodeDamage, window_from_node}; -use dom::nodelist::NodeList; use dom::nodeiterator::NodeIterator; -use dom::text::Text; +use dom::nodelist::NodeList; use dom::processinginstruction::ProcessingInstruction; use dom::range::Range; use dom::servohtmlparser::ServoHTMLParser; +use dom::text::Text; use dom::treewalker::TreeWalker; use dom::uievent::UIEvent; use dom::window::{Window, WindowHelpers, ReflowReason}; use layout_interface::{HitTestResponse, MouseOverResponse}; +use layout_interface::{ReflowGoal, ReflowQueryType}; use msg::compositor_msg::ScriptToCompositorMsg; use msg::constellation_msg::AnimationState; use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::{ConstellationChan, FocusType, Key, KeyState, KeyModifiers, MozBrowserEvent, SubpageId}; use msg::constellation_msg::{SUPER, ALT, SHIFT, CONTROL}; -use net_traits::CookieSource::NonHTTP; use net_traits::ControlMsg::{SetCookiesForUrl, GetCookiesForUrl}; +use net_traits::CookieSource::NonHTTP; use net_traits::{Metadata, PendingAsyncLoad, AsyncResponseTarget}; use script_task::Runnable; use script_traits::{MouseButton, UntrustedNodeAddress}; use util::opts; use util::str::{DOMString, split_html_space_chars}; -use layout_interface::{ReflowGoal, ReflowQueryType}; use euclid::point::Point2D; use html5ever::tree_builder::{QuirksMode, NoQuirks, LimitedQuirks, Quirks}; use ipc_channel::ipc::{self, IpcSender}; +use js::jsapi::{JSContext, JSObject, JSRuntime}; use layout_interface::{LayoutChan, Msg}; use string_cache::{Atom, QualName}; use url::Url; -use js::jsapi::{JSContext, JSObject, JSRuntime}; use num::ToPrimitive; -use std::iter::FromIterator; +use std::ascii::AsciiExt; use std::borrow::ToOwned; use std::boxed::FnBox; +use std::cell::{Cell, Ref, RefMut, RefCell}; use std::collections::HashMap; use std::collections::hash_map::Entry::{Occupied, Vacant}; -use std::ascii::AsciiExt; -use std::cell::{Cell, Ref, RefMut, RefCell}; use std::default::Default; +use std::iter::FromIterator; use std::ptr; -use std::sync::mpsc::channel; use std::rc::Rc; +use std::sync::mpsc::channel; use time; #[derive(JSTraceable, PartialEq, HeapSizeOf)] diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index 76dbf0e993a..6ffba9208f7 100644 --- a/components/script/dom/documentfragment.rs +++ b/components/script/dom/documentfragment.rs @@ -8,9 +8,9 @@ use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::codegen::InheritTypes::DocumentFragmentDerived; use dom::bindings::codegen::InheritTypes::{ElementCast, NodeCast}; use dom::bindings::codegen::UnionTypes::NodeOrString; -use dom::bindings::js::Root; use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::global::GlobalRef; +use dom::bindings::js::Root; use dom::document::Document; use dom::element::Element; use dom::eventtarget::{EventTarget, EventTargetTypeId}; diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index 902e19efbea..50999d71c0c 100644 --- a/components/script/dom/domimplementation.rs +++ b/components/script/dom/domimplementation.rs @@ -3,18 +3,18 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use document_loader::DocumentLoader; -use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::DOMImplementationBinding; use dom::bindings::codegen::Bindings::DOMImplementationBinding::DOMImplementationMethods; +use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::InheritTypes::NodeCast; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, Root}; -use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::bindings::utils::validate_qualified_name; -use dom::document::{Document, DocumentHelpers, IsHTMLDocument}; +use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::document::DocumentSource; +use dom::document::{Document, DocumentHelpers, IsHTMLDocument}; use dom::documenttype::DocumentType; use dom::htmlbodyelement::HTMLBodyElement; use dom::htmlheadelement::HTMLHeadElement; diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index a011db403df..48834425821 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -3,17 +3,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use document_loader::DocumentLoader; -use dom::bindings::codegen::Bindings::DocumentBinding::DocumentReadyState; use dom::bindings::codegen::Bindings::DOMParserBinding; use dom::bindings::codegen::Bindings::DOMParserBinding::DOMParserMethods; use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::{Text_html, Text_xml}; +use dom::bindings::codegen::Bindings::DocumentBinding::DocumentReadyState; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, Root}; use dom::bindings::utils::{Reflector, reflect_dom_object}; -use dom::document::{Document, DocumentHelpers, IsHTMLDocument}; use dom::document::DocumentSource; +use dom::document::{Document, DocumentHelpers, IsHTMLDocument}; use dom::window::{Window, WindowHelpers}; use parse::html::{ParseContext, parse_html}; use util::str::DOMString; diff --git a/components/script/dom/domstringmap.rs b/components/script/dom/domstringmap.rs index fe86d4d4b64..fdaf9d7f65c 100644 --- a/components/script/dom/domstringmap.rs +++ b/components/script/dom/domstringmap.rs @@ -8,8 +8,8 @@ use dom::bindings::error::ErrorResult; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, Root}; use dom::bindings::utils::{Reflector, reflect_dom_object}; -use dom::node::window_from_node; use dom::htmlelement::{HTMLElement, HTMLElementCustomAttributeHelpers}; +use dom::node::window_from_node; use util::str::DOMString; #[dom_struct] diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index df7dadb2b44..8571ec6b482 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -5,16 +5,16 @@ use dom::attr::{Attr, AttrHelpers}; use dom::bindings::codegen::Bindings::DOMTokenListBinding; use dom::bindings::codegen::Bindings::DOMTokenListBinding::DOMTokenListMethods; -use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::error::Error::{InvalidCharacter, Syntax}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, Root}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::element::{Element, AttributeHandlers}; use dom::node::window_from_node; -use util::str::{DOMString, HTML_SPACE_CHARACTERS, str_join}; use string_cache::Atom; +use util::str::{DOMString, HTML_SPACE_CHARACTERS, str_join}; use std::borrow::ToOwned; diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 6c8bdf028ba..2935e581a88 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -5,9 +5,8 @@ //! Element nodes. use dom::activation::Activatable; -use dom::attr::{Attr, AttrSettingType, AttrHelpers, AttrHelpersForLayout}; use dom::attr::AttrValue; -use dom::namednodemap::NamedNodeMap; +use dom::attr::{Attr, AttrSettingType, AttrHelpers, AttrHelpersForLayout}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; use dom::bindings::codegen::Bindings::ElementBinding; @@ -17,30 +16,30 @@ use dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementM use dom::bindings::codegen::Bindings::NamedNodeMapBinding::NamedNodeMapMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::InheritTypes::CharacterDataCast; -use dom::bindings::codegen::InheritTypes::{ElementCast, ElementDerived, EventTargetCast}; use dom::bindings::codegen::InheritTypes::DocumentDerived; +use dom::bindings::codegen::InheritTypes::HTMLAnchorElementCast; +use dom::bindings::codegen::InheritTypes::TextCast; +use dom::bindings::codegen::InheritTypes::{ElementCast, ElementDerived, EventTargetCast}; use dom::bindings::codegen::InheritTypes::{HTMLBodyElementDerived, HTMLFontElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLIFrameElementDerived, HTMLInputElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLInputElementDerived, HTMLTableElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLTableElementDerived, HTMLTableCellElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLTableRowElementDerived, HTMLTextAreaElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLTableSectionElementDerived, NodeCast}; -use dom::bindings::codegen::InheritTypes::HTMLAnchorElementCast; -use dom::bindings::codegen::InheritTypes::TextCast; use dom::bindings::codegen::UnionTypes::NodeOrString; -use dom::bindings::error::{ErrorResult, Fallible}; -use dom::bindings::error::Error::{InvalidCharacter, Syntax}; use dom::bindings::error::Error::NoModificationAllowed; +use dom::bindings::error::Error::{InvalidCharacter, Syntax}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::js::{JS, LayoutJS, MutNullableHeap}; use dom::bindings::js::{Root, RootedReference}; use dom::bindings::trace::RootedVec; -use dom::bindings::utils::{namespace_from_domstring, xml_name_type, validate_and_extract}; use dom::bindings::utils::XMLName::InvalidXMLName; +use dom::bindings::utils::{namespace_from_domstring, xml_name_type, validate_and_extract}; use dom::characterdata::CharacterDataHelpers; use dom::create::create_element; +use dom::document::{Document, DocumentHelpers, LayoutDocumentHelpers}; use dom::domrect::DOMRect; use dom::domrectlist::DOMRectList; -use dom::document::{Document, DocumentHelpers, LayoutDocumentHelpers}; use dom::domtokenlist::DOMTokenList; use dom::event::{Event, EventHelpers}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; @@ -50,11 +49,12 @@ use dom::htmlelement::HTMLElementTypeId; use dom::htmlfontelement::{HTMLFontElement, HTMLFontElementHelpers}; use dom::htmliframeelement::{HTMLIFrameElement, RawHTMLIFrameElementHelpers}; use dom::htmlinputelement::{HTMLInputElement, RawLayoutHTMLInputElementHelpers, HTMLInputElementHelpers}; -use dom::htmltableelement::{HTMLTableElement, HTMLTableElementHelpers}; use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementHelpers}; +use dom::htmltableelement::{HTMLTableElement, HTMLTableElementHelpers}; use dom::htmltablerowelement::{HTMLTableRowElement, HTMLTableRowElementHelpers}; use dom::htmltablesectionelement::{HTMLTableSectionElement, HTMLTableSectionElementHelpers}; use dom::htmltextareaelement::{HTMLTextAreaElement, RawLayoutHTMLTextAreaElementHelpers}; +use dom::namednodemap::NamedNodeMap; use dom::node::{CLICK_IN_PROGRESS, LayoutNodeHelpers, Node, NodeHelpers, NodeTypeId, SEQUENTIALLY_FOCUSABLE}; use dom::node::{document_from_node, NodeDamage}; use dom::node::{window_from_node}; @@ -64,9 +64,9 @@ use dom::virtualmethods::{VirtualMethods, vtable_for}; use devtools_traits::AttrInfo; use smallvec::VecLike; use style::legacy::{UnsignedIntegerAttribute, from_declaration}; -use style::properties::{PropertyDeclarationBlock, PropertyDeclaration, parse_style_attribute}; use style::properties::DeclaredValue::SpecifiedValue; use style::properties::longhands::{self, background_image, border_spacing}; +use style::properties::{PropertyDeclarationBlock, PropertyDeclaration, parse_style_attribute}; use style::values::CSSFloat; use style::values::specified::{self, CSSColor, CSSRGBA}; use util::geometry::Au; diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs index ee9d5178d30..9fa8807972b 100644 --- a/components/script/dom/errorevent.rs +++ b/components/script/dom/errorevent.rs @@ -2,24 +2,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::Bindings::ErrorEventBinding; use dom::bindings::codegen::Bindings::ErrorEventBinding::ErrorEventMethods; +use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::InheritTypes::{EventCast, ErrorEventDerived}; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::js::{Root, MutHeapJSVal}; -use js::jsapi::{JSContext, HandleValue}; use dom::bindings::trace::JSTraceable; +use js::jsapi::{JSContext, HandleValue}; use dom::bindings::utils::reflect_dom_object; use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable}; use util::str::DOMString; use dom::bindings::cell::DOMRefCell; +use js::jsval::JSVal; use std::borrow::ToOwned; use std::cell::Cell; -use js::jsval::JSVal; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/eventdispatcher.rs b/components/script/dom/eventdispatcher.rs index 3451b22d108..0f6f5bda40e 100644 --- a/components/script/dom/eventdispatcher.rs +++ b/components/script/dom/eventdispatcher.rs @@ -7,8 +7,8 @@ use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::InheritTypes::{EventTargetCast, NodeCast}; use dom::bindings::js::JS; use dom::bindings::trace::RootedVec; -use dom::eventtarget::{EventTarget, ListenerPhase}; use dom::event::{Event, EventPhase}; +use dom::eventtarget::{EventTarget, ListenerPhase}; use dom::node::{Node, NodeHelpers}; use dom::virtualmethods::vtable_for; diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 31c8e366daa..8a73be8e11e 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -7,18 +7,18 @@ use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::EventListenerBinding::EventListener; use dom::bindings::codegen::Bindings::EventTargetBinding::EventTargetMethods; -use dom::bindings::error::{Fallible, report_pending_exception}; use dom::bindings::error::Error::InvalidState; +use dom::bindings::error::{Fallible, report_pending_exception}; use dom::bindings::utils::{Reflectable, Reflector}; use dom::event::{Event, EventHelpers}; use dom::eventdispatcher::dispatch_event; use dom::node::NodeTypeId; +use dom::virtualmethods::VirtualMethods; use dom::workerglobalscope::WorkerGlobalScopeTypeId; use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTargetTypeId; -use dom::virtualmethods::VirtualMethods; use js::jsapi::{CompileFunction, JS_GetFunctionObject}; -use js::jsapi::{JSContext, RootedFunction, HandleObject}; use js::jsapi::{JSAutoCompartment, JSAutoRequest}; +use js::jsapi::{JSContext, RootedFunction, HandleObject}; use js::rust::{AutoObjectVectorWrapper, CompileOptionsWrapper}; use util::mem::HeapSizeOf; use util::str::DOMString; diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index f819a2b395c..f23578a0535 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -3,31 +3,31 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::Bindings::BlobBinding::BlobMethods; +use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::FileReaderBinding::{self, FileReaderConstants, FileReaderMethods}; use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast}; -use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; -use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::error::Error::InvalidState; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::global::{GlobalRef, GlobalField}; use dom::bindings::js::{Root, JS, MutNullableHeap}; use dom::bindings::refcounted::Trusted; use dom::bindings::utils::{reflect_dom_object, Reflectable}; -use dom::event::{EventHelpers, EventCancelable, EventBubbles}; -use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; use dom::blob::{Blob, BlobHelpers}; use dom::domexception::{DOMException, DOMErrorName}; +use dom::event::{EventHelpers, EventCancelable, EventBubbles}; +use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; use dom::progressevent::ProgressEvent; use encoding::all::UTF_8; -use encoding::types::{EncodingRef, DecoderTrap}; use encoding::label::encoding_from_whatwg_label; +use encoding::types::{EncodingRef, DecoderTrap}; use hyper::mime::{Mime, Attr}; -use std::sync::mpsc; +use rustc_serialize::base64::{Config, ToBase64, CharacterSet, Newline}; use script_task::{ScriptChan, Runnable, ScriptPort, CommonScriptMsg}; use std::cell::{Cell, RefCell}; +use std::sync::mpsc; use std::sync::mpsc::Receiver; use util::str::DOMString; use util::task::spawn_named; -use rustc_serialize::base64::{Config, ToBase64, CharacterSet, Newline}; #[derive(PartialEq, Clone, Copy, JSTraceable, HeapSizeOf)] pub enum FileReaderFunction { diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index 8b539c6b4f0..c514a963bd5 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -10,8 +10,8 @@ use dom::bindings::codegen::Bindings::HTMLAnchorElementBinding; use dom::bindings::codegen::Bindings::HTMLAnchorElementBinding::HTMLAnchorElementMethods; use dom::bindings::codegen::Bindings::MouseEventBinding::MouseEventMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; -use dom::bindings::codegen::InheritTypes::{HTMLAnchorElementDerived, HTMLImageElementDerived}; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast}; +use dom::bindings::codegen::InheritTypes::{HTMLAnchorElementDerived, HTMLImageElementDerived}; use dom::bindings::codegen::InheritTypes::{MouseEventCast, NodeCast}; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::document::{Document, DocumentHelpers}; diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs index ee93a27c67f..c2241410fd9 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/components/script/dom/htmlareaelement.rs @@ -5,8 +5,8 @@ use dom::attr::AttrValue; use dom::bindings::codegen::Bindings::HTMLAreaElementBinding; use dom::bindings::codegen::Bindings::HTMLAreaElementBinding::HTMLAreaElementMethods; -use dom::bindings::codegen::InheritTypes::{HTMLAreaElementDerived, HTMLElementCast}; use dom::bindings::codegen::InheritTypes::ElementCast; +use dom::bindings::codegen::InheritTypes::{HTMLAreaElementDerived, HTMLElementCast}; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::utils::Reflectable; use dom::document::Document; diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs index 5a7c0a6d611..202bfca992b 100644 --- a/components/script/dom/htmlbaseelement.rs +++ b/components/script/dom/htmlbaseelement.rs @@ -9,8 +9,8 @@ use dom::bindings::codegen::InheritTypes::HTMLBaseElementDerived; use dom::bindings::codegen::InheritTypes::HTMLElementCast; use dom::bindings::js::Root; use dom::document::{Document, DocumentHelpers}; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::{ElementTypeId, AttributeHandlers}; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId, document_from_node}; use dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index b886c9e91ec..0b9412613e1 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -22,8 +22,8 @@ use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::Msg as ConstellationMsg; use cssparser::RGBA; -use util::str::{self, DOMString}; use url::{Url, UrlParser}; +use util::str::{self, DOMString}; use std::borrow::ToOwned; use std::cell::Cell; diff --git a/components/script/dom/htmlbrelement.rs b/components/script/dom/htmlbrelement.rs index 962fcc54837..6330c15ddbb 100644 --- a/components/script/dom/htmlbrelement.rs +++ b/components/script/dom/htmlbrelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLBRElementBinding; use dom::bindings::codegen::InheritTypes::HTMLBRElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index b1cc150fe52..54f6145b3b9 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -11,8 +11,8 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, HTMLBut use dom::bindings::codegen::InheritTypes::{HTMLButtonElementDerived, HTMLFieldSetElementDerived}; use dom::bindings::js::Root; use dom::document::Document; -use dom::element::{AttributeHandlers, Element, ElementTypeId}; use dom::element::ActivationElementHelpers; +use dom::element::{AttributeHandlers, Element, ElementTypeId}; use dom::event::Event; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; @@ -24,8 +24,8 @@ use dom::virtualmethods::VirtualMethods; use std::ascii::AsciiExt; use std::borrow::ToOwned; -use util::str::DOMString; use std::cell::Cell; +use util::str::DOMString; #[derive(JSTraceable, PartialEq, Copy, Clone)] #[allow(dead_code)] diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index 6f307542148..4823f881be7 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -6,28 +6,28 @@ use dom::attr::Attr; use dom::attr::AttrHelpers; use dom::bindings::codegen::Bindings::HTMLCanvasElementBinding; use dom::bindings::codegen::Bindings::HTMLCanvasElementBinding::HTMLCanvasElementMethods; +use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLContextAttributes; use dom::bindings::codegen::InheritTypes::HTMLCanvasElementDerived; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast}; use dom::bindings::codegen::UnionTypes::CanvasRenderingContext2DOrWebGLRenderingContext; -use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLContextAttributes; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, LayoutJS, MutNullableHeap, HeapGCValue, Root}; use dom::bindings::utils::{Reflectable}; use dom::canvasrenderingcontext2d::{CanvasRenderingContext2D, LayoutCanvasRenderingContext2DHelpers}; use dom::document::Document; use dom::element::AttributeHandlers; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId, window_from_node}; use dom::virtualmethods::VirtualMethods; use dom::webglrenderingcontext::{WebGLRenderingContext, LayoutCanvasWebGLRenderingContextHelpers}; -use util::str::{DOMString, parse_unsigned_integer}; -use js::jsapi::{JSContext, HandleValue}; -use offscreen_gl_context::GLContextAttributes; use canvas_traits::CanvasMsg; use ipc_channel::ipc::IpcSender; +use js::jsapi::{JSContext, HandleValue}; +use offscreen_gl_context::GLContextAttributes; +use util::str::{DOMString, parse_unsigned_integer}; use euclid::size::Size2D; diff --git a/components/script/dom/htmldataelement.rs b/components/script/dom/htmldataelement.rs index da5bc60f522..915f5d32b02 100644 --- a/components/script/dom/htmldataelement.rs +++ b/components/script/dom/htmldataelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLDataElementBinding; use dom::bindings::codegen::InheritTypes::HTMLDataElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs index e4037c8ba47..17b1f019ee8 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/components/script/dom/htmldatalistelement.rs @@ -4,14 +4,14 @@ use dom::bindings::codegen::Bindings::HTMLDataListElementBinding; use dom::bindings::codegen::Bindings::HTMLDataListElementBinding::HTMLDataListElementMethods; -use dom::bindings::codegen::InheritTypes::{HTMLDataListElementDerived, HTMLOptionElementDerived}; use dom::bindings::codegen::InheritTypes::NodeCast; +use dom::bindings::codegen::InheritTypes::{HTMLDataListElementDerived, HTMLOptionElementDerived}; use dom::bindings::js::Root; use dom::document::Document; use dom::element::Element; +use dom::element::ElementTypeId; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlcollection::{HTMLCollection, CollectionFilter}; -use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId, window_from_node}; use util::str::DOMString; diff --git a/components/script/dom/htmldialogelement.rs b/components/script/dom/htmldialogelement.rs index 482c92a80e4..e3003c25d0f 100644 --- a/components/script/dom/htmldialogelement.rs +++ b/components/script/dom/htmldialogelement.rs @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::HTMLDialogElementBinding; use dom::bindings::codegen::Bindings::HTMLDialogElementBinding::HTMLDialogElementMethods; use dom::bindings::codegen::InheritTypes::HTMLDialogElementDerived; -use dom::bindings::cell::DOMRefCell; use dom::bindings::js::Root; use dom::document::Document; use dom::element::ElementTypeId; diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index e5f8f35221b..8b3e1863bca 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -13,9 +13,9 @@ use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLFrameSetElementDerived}; use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLInputElementCast, NodeCast}; use dom::bindings::codegen::InheritTypes::{HTMLElementDerived, HTMLBodyElementDerived, HTMLHtmlElementDerived}; -use dom::bindings::js::{JS, MutNullableHeap, Root}; -use dom::bindings::error::ErrorResult; use dom::bindings::error::Error::Syntax; +use dom::bindings::error::ErrorResult; +use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::utils::Reflectable; use dom::cssstyledeclaration::{CSSStyleDeclaration, CSSModificationAccess}; use dom::document::{Document, DocumentHelpers}; diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index 55fd44f1c7a..de94e16b192 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -6,14 +6,14 @@ use dom::attr::Attr; use dom::attr::AttrHelpers; use dom::bindings::codegen::Bindings::HTMLFieldSetElementBinding; use dom::bindings::codegen::Bindings::HTMLFieldSetElementBinding::HTMLFieldSetElementMethods; -use dom::bindings::codegen::InheritTypes::{HTMLFieldSetElementDerived, NodeCast}; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLLegendElementDerived}; +use dom::bindings::codegen::InheritTypes::{HTMLFieldSetElementDerived, NodeCast}; use dom::bindings::js::{Root, RootedReference}; use dom::document::Document; +use dom::element::ElementTypeId; use dom::element::{AttributeHandlers, Element, ElementHelpers}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlcollection::{HTMLCollection, CollectionFilter}; -use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId, window_from_node}; use dom::validitystate::ValidityState; diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index 61152a47a00..11825e78c06 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/components/script/dom/htmlfontelement.rs @@ -8,8 +8,8 @@ use dom::bindings::codegen::Bindings::HTMLFontElementBinding::HTMLFontElementMet use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLFontElementDerived}; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index b63037486c0..d015c8eb4e1 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -5,10 +5,10 @@ use dom::attr::AttrValue; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::EventBinding::EventMethods; +use dom::bindings::codegen::Bindings::HTMLButtonElementBinding::HTMLButtonElementMethods; use dom::bindings::codegen::Bindings::HTMLFormElementBinding; use dom::bindings::codegen::Bindings::HTMLFormElementBinding::HTMLFormElementMethods; use dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementMethods; -use dom::bindings::codegen::Bindings::HTMLButtonElementBinding::HTMLButtonElementMethods; use dom::bindings::codegen::InheritTypes::EventTargetCast; use dom::bindings::codegen::InheritTypes::HTMLDataListElementCast; use dom::bindings::codegen::InheritTypes::HTMLElementCast; @@ -19,25 +19,25 @@ use dom::bindings::codegen::InheritTypes::{HTMLTextAreaElementCast, NodeCast}; use dom::bindings::global::GlobalRef; use dom::bindings::js::{Root}; use dom::document::{Document, DocumentHelpers}; +use dom::element::ElementTypeId; use dom::element::{Element, AttributeHandlers}; use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use dom::element::ElementTypeId; +use dom::htmlbuttonelement::{HTMLButtonElement}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::htmlinputelement::{HTMLInputElement, HTMLInputElementHelpers}; -use dom::htmlbuttonelement::{HTMLButtonElement}; use dom::htmltextareaelement::HTMLTextAreaElementHelpers; use dom::node::{Node, NodeHelpers, NodeTypeId, document_from_node, window_from_node}; use dom::virtualmethods::VirtualMethods; -use hyper::method::Method; use hyper::header::ContentType; +use hyper::method::Method; use hyper::mime; use msg::constellation_msg::LoadData; -use util::str::DOMString; use script_task::{ScriptChan, MainThreadScriptMsg}; +use string_cache::Atom; use url::UrlParser; use url::form_urlencoded::serialize; -use string_cache::Atom; +use util::str::DOMString; use std::borrow::ToOwned; use std::cell::Cell; diff --git a/components/script/dom/htmlframeelement.rs b/components/script/dom/htmlframeelement.rs index 450cabfb293..7d60ccc6352 100644 --- a/components/script/dom/htmlframeelement.rs +++ b/components/script/dom/htmlframeelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLFrameElementBinding; use dom::bindings::codegen::InheritTypes::HTMLFrameElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlframesetelement.rs b/components/script/dom/htmlframesetelement.rs index 19129e612e2..5a42343f76f 100644 --- a/components/script/dom/htmlframesetelement.rs +++ b/components/script/dom/htmlframesetelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLFrameSetElementBinding; use dom::bindings::codegen::InheritTypes::HTMLFrameSetElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs index bfc46895de7..0353ace6436 100644 --- a/components/script/dom/htmlheadelement.rs +++ b/components/script/dom/htmlheadelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLHeadElementBinding; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLHeadElementDerived}; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use dom::userscripts::load_script; diff --git a/components/script/dom/htmlheadingelement.rs b/components/script/dom/htmlheadingelement.rs index b339a75a8a4..3b01900688d 100644 --- a/components/script/dom/htmlheadingelement.rs +++ b/components/script/dom/htmlheadingelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLHeadingElementBinding; use dom::bindings::codegen::InheritTypes::HTMLHeadingElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/htmlhrelement.rs index 6e1c228a7d6..ffbe53fadb2 100644 --- a/components/script/dom/htmlhrelement.rs +++ b/components/script/dom/htmlhrelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLHRElementBinding; use dom::bindings::codegen::InheritTypes::HTMLHRElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlhtmlelement.rs b/components/script/dom/htmlhtmlelement.rs index 497ca631e78..4e5250063a7 100644 --- a/components/script/dom/htmlhtmlelement.rs +++ b/components/script/dom/htmlhtmlelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLHtmlElementBinding; use dom::bindings::codegen::InheritTypes::HTMLHtmlElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index eed9a99aac0..213db677812 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -6,21 +6,21 @@ use dom::attr::{Attr, AttrHelpers, AttrHelpersForLayout, AttrValue}; use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding; use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; -use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast, EventCast}; -use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLElementCast}; use dom::bindings::codegen::InheritTypes::HTMLIFrameElementDerived; +use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLElementCast}; +use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast, EventCast}; use dom::bindings::conversions::ToJSValConvertible; -use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::error::Error::NotSupported; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::global::GlobalRef; use dom::bindings::js::{Root}; use dom::bindings::utils::Reflectable; use dom::customevent::CustomEvent; use dom::document::Document; +use dom::element::ElementTypeId; use dom::element::{self, AttributeHandlers}; use dom::event::EventHelpers; use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeHelpers, NodeTypeId, window_from_node}; use dom::urlhelper::UrlHelper; @@ -28,20 +28,20 @@ use dom::virtualmethods::VirtualMethods; use dom::window::{Window, WindowHelpers}; use page::IterablePage; -use msg::constellation_msg::{PipelineId, SubpageId, ConstellationChan, MozBrowserEvent, NavigationDirection}; use msg::constellation_msg::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed}; use msg::constellation_msg::Msg as ConstellationMsg; +use msg::constellation_msg::{PipelineId, SubpageId, ConstellationChan, MozBrowserEvent, NavigationDirection}; +use string_cache::Atom; use util::opts; use util::str::DOMString; -use string_cache::Atom; +use js::jsapi::{RootedValue, JSAutoRequest, JSAutoCompartment}; +use js::jsval::UndefinedValue; use std::ascii::AsciiExt; use std::borrow::ToOwned; use std::cell::Cell; use url::{Url, UrlParser}; use util::str::{self, LengthOrPercentageOrAuto}; -use js::jsapi::{RootedValue, JSAutoRequest, JSAutoCompartment}; -use js::jsval::UndefinedValue; #[derive(HeapSizeOf)] enum SandboxAllowance { diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 53b2cf7fc22..88a73907324 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -8,24 +8,24 @@ use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::HTMLImageElementBinding; use dom::bindings::codegen::Bindings::HTMLImageElementBinding::HTMLImageElementMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; -use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast, EventTargetCast}; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLImageElementDerived}; +use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast, EventTargetCast}; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::js::{LayoutJS, Root}; use dom::bindings::refcounted::Trusted; use dom::document::{Document, DocumentHelpers}; use dom::element::AttributeHandlers; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; use dom::event::{Event, EventBubbles, EventCancelable, EventHelpers}; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{document_from_node, Node, NodeTypeId, NodeHelpers, NodeDamage, window_from_node}; use dom::virtualmethods::VirtualMethods; use dom::window::WindowHelpers; use script_task::{Runnable, ScriptChan, CommonScriptMsg}; -use util::str::DOMString; use string_cache::Atom; +use util::str::DOMString; use ipc_channel::ipc; use ipc_channel::router::ROUTER; diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index f8a6e0a426d..1985c905220 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -3,40 +3,40 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::activation::Activatable; -use dom::attr::{Attr, AttrValue}; use dom::attr::AttrHelpers; +use dom::attr::{Attr, AttrValue}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; use dom::bindings::codegen::Bindings::EventBinding::EventMethods; -use dom::bindings::codegen::Bindings::KeyboardEventBinding::KeyboardEventMethods; use dom::bindings::codegen::Bindings::HTMLInputElementBinding; use dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementMethods; +use dom::bindings::codegen::Bindings::KeyboardEventBinding::KeyboardEventMethods; +use dom::bindings::codegen::InheritTypes::KeyboardEventCast; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, HTMLInputElementCast, NodeCast}; use dom::bindings::codegen::InheritTypes::{HTMLInputElementDerived, HTMLFieldSetElementDerived, EventTargetCast}; -use dom::bindings::codegen::InheritTypes::KeyboardEventCast; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, LayoutJS, Root, RootedReference}; use dom::document::{Document, DocumentHelpers}; +use dom::element::ElementTypeId; use dom::element::{AttributeHandlers, Element}; use dom::element::{RawLayoutElementHelpers, ActivationElementHelpers}; use dom::event::{Event, EventBubbles, EventCancelable, EventHelpers}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; -use dom::keyboardevent::KeyboardEvent; use dom::htmlformelement::{FormSubmitter, FormControl, HTMLFormElement, HTMLFormElementHelpers}; use dom::htmlformelement::{SubmittedFrom, ResetFrom}; +use dom::keyboardevent::KeyboardEvent; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeDamage, NodeTypeId}; use dom::node::{document_from_node, window_from_node}; use dom::virtualmethods::VirtualMethods; use dom::window::WindowHelpers; -use textinput::TextInput; +use msg::constellation_msg::ConstellationChan; use textinput::KeyReaction::{TriggerDefaultAction, DispatchInput, Nothing}; use textinput::Lines::Single; -use msg::constellation_msg::ConstellationChan; +use textinput::TextInput; -use util::str::DOMString; use string_cache::Atom; +use util::str::DOMString; use std::borrow::ToOwned; use std::cell::Cell; diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs index 4b66644f060..479f85d9660 100644 --- a/components/script/dom/htmllabelelement.rs +++ b/components/script/dom/htmllabelelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLLabelElementBinding; use dom::bindings::codegen::InheritTypes::HTMLLabelElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmllegendelement.rs b/components/script/dom/htmllegendelement.rs index 50d67a400d1..0b992092f6f 100644 --- a/components/script/dom/htmllegendelement.rs +++ b/components/script/dom/htmllegendelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLLegendElementBinding; use dom::bindings::codegen::InheritTypes::HTMLLegendElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmllielement.rs b/components/script/dom/htmllielement.rs index a5f15fefec9..ca552e0b405 100644 --- a/components/script/dom/htmllielement.rs +++ b/components/script/dom/htmllielement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLLIElementBinding; use dom::bindings::codegen::InheritTypes::HTMLLIElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index b5012a2b6f3..7ae868bae51 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -2,24 +2,25 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use cssparser::Parser as CssParser; use document_loader::LoadType; -use dom::attr::{Attr, AttrValue}; use dom::attr::AttrHelpers; +use dom::attr::{Attr, AttrValue}; use dom::bindings::codegen::Bindings::HTMLLinkElementBinding; use dom::bindings::codegen::Bindings::HTMLLinkElementBinding::HTMLLinkElementMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; -use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLLinkElementDerived}; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, NodeCast}; +use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLLinkElementDerived}; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::js::{RootedReference}; use dom::bindings::refcounted::Trusted; use dom::document::{Document, DocumentHelpers}; use dom::domtokenlist::DOMTokenList; +use dom::element::ElementTypeId; use dom::element::{AttributeHandlers, Element}; use dom::event::{EventBubbles, EventCancelable, Event, EventHelpers}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeHelpers, NodeTypeId, window_from_node}; use dom::virtualmethods::VirtualMethods; @@ -28,15 +29,14 @@ use layout_interface::{LayoutChan, Msg}; use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::Msg as ConstellationMsg; use script_traits::StylesheetLoadResponder; -use util::str::{DOMString, HTML_SPACE_CHARACTERS}; use style::media_queries::parse_media_query_list; -use cssparser::Parser as CssParser; +use util::str::{DOMString, HTML_SPACE_CHARACTERS}; use std::ascii::AsciiExt; use std::borrow::ToOwned; use std::default::Default; -use url::UrlParser; use string_cache::Atom; +use url::UrlParser; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/htmlmapelement.rs b/components/script/dom/htmlmapelement.rs index 64b4b7b55a7..e79bd1db4c3 100644 --- a/components/script/dom/htmlmapelement.rs +++ b/components/script/dom/htmlmapelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLMapElementBinding; use dom::bindings::codegen::InheritTypes::HTMLMapElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 95b7cc5060b..227f298d96d 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -4,8 +4,8 @@ use dom::bindings::codegen::InheritTypes::HTMLMediaElementDerived; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::NodeTypeId; use util::str::DOMString; diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index cc2fe60ecbd..55561c81fc0 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -7,8 +7,8 @@ use dom::bindings::codegen::Bindings::HTMLMetaElementBinding::HTMLMetaElementMet use dom::bindings::codegen::InheritTypes::HTMLMetaElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlmeterelement.rs b/components/script/dom/htmlmeterelement.rs index 6247b701a87..d91be36f600 100644 --- a/components/script/dom/htmlmeterelement.rs +++ b/components/script/dom/htmlmeterelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLMeterElementBinding; use dom::bindings::codegen::InheritTypes::HTMLMeterElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlmodelement.rs b/components/script/dom/htmlmodelement.rs index 446c4b70544..eed06692bce 100644 --- a/components/script/dom/htmlmodelement.rs +++ b/components/script/dom/htmlmodelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLModElementBinding; use dom::bindings::codegen::InheritTypes::HTMLModElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index 08406a85ea5..ba0784ab7fb 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -13,16 +13,16 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast}; use dom::bindings::js::Root; use dom::document::Document; use dom::element::AttributeHandlers; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId, NodeHelpers, window_from_node}; use dom::validitystate::ValidityState; use dom::virtualmethods::VirtualMethods; use net_traits::image::base::Image; -use util::str::DOMString; use std::sync::Arc; +use util::str::DOMString; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/htmlolistelement.rs b/components/script/dom/htmlolistelement.rs index 6bf0e106f60..ec27e04ab0a 100644 --- a/components/script/dom/htmlolistelement.rs +++ b/components/script/dom/htmlolistelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLOListElementBinding; use dom::bindings::codegen::InheritTypes::HTMLOListElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index 297a0dcedb8..9993f9576b2 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -11,8 +11,8 @@ use dom::bindings::codegen::InheritTypes::{HTMLOptGroupElementDerived, HTMLOptio use dom::bindings::js::Root; use dom::document::Document; use dom::element::AttributeHandlers; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId}; use dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index 93ed56c437e..55685d6527f 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -7,15 +7,15 @@ use dom::attr::AttrHelpers; use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods; use dom::bindings::codegen::Bindings::HTMLOptionElementBinding; use dom::bindings::codegen::Bindings::HTMLOptionElementBinding::HTMLOptionElementMethods; +use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::InheritTypes::{CharacterDataCast, ElementCast, HTMLElementCast, NodeCast, TextDerived}; use dom::bindings::codegen::InheritTypes::{HTMLOptionElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLScriptElementDerived}; -use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::js::Root; use dom::document::Document; +use dom::element::ElementTypeId; use dom::element::{AttributeHandlers, ElementHelpers}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId}; use dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs index 117294c3b6e..48a8dd40ff6 100644 --- a/components/script/dom/htmloutputelement.rs +++ b/components/script/dom/htmloutputelement.rs @@ -7,8 +7,8 @@ use dom::bindings::codegen::Bindings::HTMLOutputElementBinding::HTMLOutputElemen use dom::bindings::codegen::InheritTypes::HTMLOutputElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId, window_from_node}; use dom::validitystate::ValidityState; diff --git a/components/script/dom/htmlparagraphelement.rs b/components/script/dom/htmlparagraphelement.rs index aa5aec990c9..3c39eb42925 100644 --- a/components/script/dom/htmlparagraphelement.rs +++ b/components/script/dom/htmlparagraphelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLParagraphElementBinding; use dom::bindings::codegen::InheritTypes::HTMLParagraphElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlparamelement.rs b/components/script/dom/htmlparamelement.rs index 5df9ff982ef..e1c5a2deea6 100644 --- a/components/script/dom/htmlparamelement.rs +++ b/components/script/dom/htmlparamelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLParamElementBinding; use dom::bindings::codegen::InheritTypes::HTMLParamElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlpreelement.rs b/components/script/dom/htmlpreelement.rs index 3fc2fea0387..bb5000b895b 100644 --- a/components/script/dom/htmlpreelement.rs +++ b/components/script/dom/htmlpreelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLPreElementBinding; use dom::bindings::codegen::InheritTypes::HTMLPreElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlprogresselement.rs b/components/script/dom/htmlprogresselement.rs index a03dfe8f1e4..ea507d36fbc 100644 --- a/components/script/dom/htmlprogresselement.rs +++ b/components/script/dom/htmlprogresselement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLProgressElementBinding; use dom::bindings::codegen::InheritTypes::HTMLProgressElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlquoteelement.rs b/components/script/dom/htmlquoteelement.rs index c7ad4d75d9a..8162bcb5244 100644 --- a/components/script/dom/htmlquoteelement.rs +++ b/components/script/dom/htmlquoteelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLQuoteElementBinding; use dom::bindings::codegen::InheritTypes::HTMLQuoteElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index b2a068e61b0..d38930d4d54 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -13,43 +13,43 @@ use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::HTMLScriptElementBinding; use dom::bindings::codegen::Bindings::HTMLScriptElementBinding::HTMLScriptElementMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; -use dom::bindings::codegen::InheritTypes::{HTMLScriptElementDerived, HTMLScriptElementCast}; -use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, NodeCast}; use dom::bindings::codegen::InheritTypes::EventTargetCast; +use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, NodeCast}; +use dom::bindings::codegen::InheritTypes::{HTMLScriptElementDerived, HTMLScriptElementCast}; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{JS, Root}; use dom::bindings::js::RootedReference; +use dom::bindings::js::{JS, Root}; use dom::bindings::refcounted::Trusted; use dom::bindings::trace::JSTraceable; use dom::document::{Document, DocumentHelpers}; +use dom::element::ElementTypeId; use dom::element::{AttributeHandlers, ElementCreator}; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::event::{Event, EventBubbles, EventCancelable, EventHelpers}; -use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{ChildrenMutation, CloneChildrenFlag, Node, NodeHelpers}; use dom::node::{NodeTypeId, document_from_node, window_from_node}; use dom::servohtmlparser::ServoHTMLParserHelpers; use dom::virtualmethods::VirtualMethods; use dom::window::{WindowHelpers, ScriptHelpers}; -use network_listener::{NetworkListener, PreInvoke}; -use script_task::{ScriptChan, Runnable, CommonScriptMsg}; use js::jsapi::RootedValue; use js::jsval::UndefinedValue; +use network_listener::{NetworkListener, PreInvoke}; +use script_task::{ScriptChan, Runnable, CommonScriptMsg}; use encoding::all::UTF_8; use encoding::label::encoding_from_whatwg_label; use encoding::types::{Encoding, EncodingRef, DecoderTrap}; +use html5ever::tree_builder::NextParserState; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use net_traits::{Metadata, AsyncResponseListener, AsyncResponseTarget}; -use util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec}; -use html5ever::tree_builder::NextParserState; use std::cell::{RefCell, Cell}; use std::mem; use std::sync::{Arc, Mutex}; use string_cache::Atom; use url::{Url, UrlParser}; +use util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec}; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index f2628f6b882..6b5027f39da 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -12,15 +12,15 @@ use dom::bindings::codegen::UnionTypes::HTMLOptionElementOrHTMLOptGroupElement; use dom::bindings::js::Root; use dom::document::Document; use dom::element::AttributeHandlers; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId, window_from_node}; use dom::validitystate::ValidityState; use dom::virtualmethods::VirtualMethods; -use util::str::DOMString; use string_cache::Atom; +use util::str::DOMString; use std::borrow::ToOwned; diff --git a/components/script/dom/htmlsourceelement.rs b/components/script/dom/htmlsourceelement.rs index 5b00feab231..1d1294883f4 100644 --- a/components/script/dom/htmlsourceelement.rs +++ b/components/script/dom/htmlsourceelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLSourceElementBinding; use dom::bindings::codegen::InheritTypes::HTMLSourceElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlspanelement.rs b/components/script/dom/htmlspanelement.rs index 8bbad4c20bb..2cb3f766767 100644 --- a/components/script/dom/htmlspanelement.rs +++ b/components/script/dom/htmlspanelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLSpanElementBinding; use dom::bindings::codegen::InheritTypes::HTMLSpanElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index a8a989641a0..fb87535fa3a 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -2,24 +2,24 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use cssparser::Parser as CssParser; use dom::attr::AttrHelpers; use dom::bindings::codegen::Bindings::HTMLStyleElementBinding; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, HTMLStyleElementDerived, NodeCast}; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::{ElementTypeId, AttributeHandlers}; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; -use dom::node::{ChildrenMutation, Node, NodeHelpers, NodeTypeId}; use dom::node::window_from_node; +use dom::node::{ChildrenMutation, Node, NodeHelpers, NodeTypeId}; use dom::virtualmethods::VirtualMethods; use dom::window::WindowHelpers; use layout_interface::{LayoutChan, Msg}; -use util::str::DOMString; -use style::stylesheets::{Origin, Stylesheet}; use style::media_queries::parse_media_query_list; -use cssparser::Parser as CssParser; +use style::stylesheets::{Origin, Stylesheet}; +use util::str::DOMString; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/htmltablecaptionelement.rs b/components/script/dom/htmltablecaptionelement.rs index ca6ee6037d2..80d643e338a 100644 --- a/components/script/dom/htmltablecaptionelement.rs +++ b/components/script/dom/htmltablecaptionelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLTableCaptionElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableCaptionElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs index 6f5d580eee8..29cf8eaaebd 100644 --- a/components/script/dom/htmltablecellelement.rs +++ b/components/script/dom/htmltablecellelement.rs @@ -6,8 +6,8 @@ use dom::attr::{Attr, AttrHelpers, AttrValue}; use dom::bindings::codegen::Bindings::HTMLTableCellElementBinding::HTMLTableCellElementMethods; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTableCellElementDerived}; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::NodeTypeId; use dom::virtualmethods::VirtualMethods; diff --git a/components/script/dom/htmltablecolelement.rs b/components/script/dom/htmltablecolelement.rs index ab7f26da579..24cbd7ae335 100644 --- a/components/script/dom/htmltablecolelement.rs +++ b/components/script/dom/htmltablecolelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLTableColElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableColElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmltabledatacellelement.rs b/components/script/dom/htmltabledatacellelement.rs index a26c5da8bbf..248374948fc 100644 --- a/components/script/dom/htmltabledatacellelement.rs +++ b/components/script/dom/htmltabledatacellelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLTableDataCellElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableDataCellElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::HTMLElementTypeId; use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementTypeId}; use dom::node::{Node, NodeTypeId}; diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index e889716572d..1d05cf70060 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -3,16 +3,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::attr::{Attr, AttrHelpers, AttrValue}; -use dom::bindings::codegen::Bindings::HTMLTableElementBinding::HTMLTableElementMethods; use dom::bindings::codegen::Bindings::HTMLTableElementBinding; +use dom::bindings::codegen::Bindings::HTMLTableElementBinding::HTMLTableElementMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; +use dom::bindings::codegen::InheritTypes::HTMLTableSectionElementDerived; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, HTMLTableCaptionElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLTableElementDerived, NodeCast}; -use dom::bindings::codegen::InheritTypes::HTMLTableSectionElementDerived; use dom::bindings::js::{Root, RootedReference}; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::{ElementHelpers, ElementTypeId}; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::htmltablecaptionelement::HTMLTableCaptionElement; use dom::htmltablesectionelement::HTMLTableSectionElement; diff --git a/components/script/dom/htmltableheadercellelement.rs b/components/script/dom/htmltableheadercellelement.rs index 3bcd41db05d..8b5cc867354 100644 --- a/components/script/dom/htmltableheadercellelement.rs +++ b/components/script/dom/htmltableheadercellelement.rs @@ -7,8 +7,8 @@ use dom::bindings::codegen::InheritTypes::HTMLTableHeaderCellElementDerived; use dom::bindings::js::Root; use dom::document::Document; use dom::element::ElementTypeId; -use dom::htmlelement::HTMLElementTypeId; use dom::eventtarget::{EventTarget, EventTargetTypeId}; +use dom::htmlelement::HTMLElementTypeId; use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs index 5d200eac16f..d93a4462bd8 100644 --- a/components/script/dom/htmltablerowelement.rs +++ b/components/script/dom/htmltablerowelement.rs @@ -7,15 +7,15 @@ use dom::bindings::codegen::Bindings::HTMLTableRowElementBinding; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTableRowElementDerived}; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use dom::virtualmethods::VirtualMethods; use cssparser::RGBA; -use util::str::{self, DOMString}; use std::cell::Cell; +use util::str::{self, DOMString}; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs index ceb03aa60ec..d0f1b8dd60d 100644 --- a/components/script/dom/htmltablesectionelement.rs +++ b/components/script/dom/htmltablesectionelement.rs @@ -7,15 +7,15 @@ use dom::bindings::codegen::Bindings::HTMLTableSectionElementBinding; use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTableSectionElementDerived}; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use dom::virtualmethods::VirtualMethods; use cssparser::RGBA; -use util::str::{self, DOMString}; use std::cell::Cell; +use util::str::{self, DOMString}; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/htmltemplateelement.rs b/components/script/dom/htmltemplateelement.rs index ba3250e0744..099e0f2975c 100644 --- a/components/script/dom/htmltemplateelement.rs +++ b/components/script/dom/htmltemplateelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTemplateElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 9cd91e217bd..f92f797a4d5 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -2,37 +2,37 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::attr::{Attr, AttrValue}; use dom::attr::AttrHelpers; +use dom::attr::{Attr, AttrValue}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding; use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding::HTMLTextAreaElementMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; +use dom::bindings::codegen::InheritTypes::KeyboardEventCast; use dom::bindings::codegen::InheritTypes::{ElementCast, EventTargetCast, HTMLElementCast, NodeCast}; use dom::bindings::codegen::InheritTypes::{HTMLTextAreaElementDerived, HTMLFieldSetElementDerived}; -use dom::bindings::codegen::InheritTypes::KeyboardEventCast; use dom::bindings::global::GlobalRef; use dom::bindings::js::{LayoutJS, Root}; use dom::bindings::refcounted::Trusted; use dom::document::{Document, DocumentHelpers}; +use dom::element::ElementTypeId; use dom::element::{Element, AttributeHandlers}; use dom::event::{Event, EventBubbles, EventCancelable}; use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; -use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::htmlformelement::FormControl; use dom::keyboardevent::KeyboardEvent; use dom::node::{ChildrenMutation, DisabledStateHelpers, Node, NodeDamage}; use dom::node::{NodeHelpers, NodeTypeId, document_from_node, window_from_node}; -use textinput::{TextInput, Lines, KeyReaction}; use dom::virtualmethods::VirtualMethods; use dom::window::WindowHelpers; -use script_task::{Runnable, CommonScriptMsg}; use msg::constellation_msg::ConstellationChan; +use script_task::{Runnable, CommonScriptMsg}; +use textinput::{TextInput, Lines, KeyReaction}; -use util::str::DOMString; use string_cache::Atom; +use util::str::DOMString; use std::borrow::ToOwned; use std::cell::Cell; diff --git a/components/script/dom/htmltimeelement.rs b/components/script/dom/htmltimeelement.rs index 37bca69f08d..4a94581a386 100644 --- a/components/script/dom/htmltimeelement.rs +++ b/components/script/dom/htmltimeelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLTimeElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTimeElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs index edc8c73946f..99aebc3e978 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/htmltitleelement.rs @@ -5,13 +5,13 @@ use dom::bindings::codegen::Bindings::HTMLTitleElementBinding; use dom::bindings::codegen::Bindings::HTMLTitleElementBinding::HTMLTitleElementMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; -use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTitleElementDerived, NodeCast}; use dom::bindings::codegen::InheritTypes::{CharacterDataCast, TextCast}; +use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTitleElementDerived, NodeCast}; use dom::bindings::js::Root; use dom::characterdata::CharacterDataHelpers; use dom::document::{Document, DocumentHelpers}; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{ChildrenMutation, Node, NodeHelpers, NodeTypeId}; use dom::text::Text; diff --git a/components/script/dom/htmltrackelement.rs b/components/script/dom/htmltrackelement.rs index 599a214f1d9..df3582483ec 100644 --- a/components/script/dom/htmltrackelement.rs +++ b/components/script/dom/htmltrackelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLTrackElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTrackElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/htmlulistelement.rs b/components/script/dom/htmlulistelement.rs index 40133f9b365..0ec7be9d5ca 100644 --- a/components/script/dom/htmlulistelement.rs +++ b/components/script/dom/htmlulistelement.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::HTMLUListElementBinding; use dom::bindings::codegen::InheritTypes::HTMLUListElementDerived; use dom::bindings::js::Root; use dom::document::Document; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; +use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index 00b725b7b97..88ed652f752 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -11,10 +11,10 @@ use euclid::size::Size2D; use js::jsapi::{JSContext, JSObject, Heap}; use js::jsapi::{JS_NewUint8ClampedArray, JS_GetUint8ClampedArrayData}; use libc::uint8_t; -use std::vec::Vec; -use std::slice; -use std::ptr; use std::default::Default; +use std::ptr; +use std::slice; +use std::vec::Vec; #[dom_struct] #[allow(raw_pointer_derive)] diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs index a3e2a24cb1a..e17bd16a513 100644 --- a/components/script/dom/location.rs +++ b/components/script/dom/location.rs @@ -12,8 +12,8 @@ use dom::urlhelper::UrlHelper; use dom::window::Window; use dom::window::WindowHelpers; -use util::str::DOMString; use url::{Url, UrlParser}; +use util::str::DOMString; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index 74fae719db5..c2becf46c48 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -6,8 +6,8 @@ macro_rules! make_getter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self) -> DOMString { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let element = ElementCast::from_ref(self); element.get_string_attribute(&Atom::from_slice($htmlname)) @@ -22,8 +22,8 @@ macro_rules! make_getter( macro_rules! make_bool_getter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self) -> bool { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. @@ -39,8 +39,8 @@ macro_rules! make_bool_getter( macro_rules! make_uint_getter( ($attr:ident, $htmlname:expr, $default:expr) => ( fn $attr(self) -> u32 { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. @@ -59,8 +59,8 @@ macro_rules! make_uint_getter( macro_rules! make_url_getter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self) -> DOMString { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. @@ -77,8 +77,8 @@ macro_rules! make_url_getter( macro_rules! make_url_or_base_getter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self) -> DOMString { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use dom::window::WindowHelpers; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -100,11 +100,11 @@ macro_rules! make_url_or_base_getter( macro_rules! make_enumerated_getter( ( $attr:ident, $htmlname:expr, $default:expr, $(($choices: pat))|+) => ( fn $attr(self) -> DOMString { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; - use string_cache::Atom; - use std::borrow::ToOwned; + use dom::element::AttributeHandlers; use std::ascii::AsciiExt; + use std::borrow::ToOwned; + use string_cache::Atom; let element = ElementCast::from_ref(self); let mut val = element.get_string_attribute(&Atom::from_slice($htmlname)); val.make_ascii_lowercase(); @@ -126,8 +126,8 @@ macro_rules! make_enumerated_getter( macro_rules! make_setter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self, value: DOMString) { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. @@ -140,8 +140,8 @@ macro_rules! make_setter( macro_rules! make_bool_setter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self, value: bool) { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. @@ -154,8 +154,8 @@ macro_rules! make_bool_setter( macro_rules! make_uint_setter( ($attr:ident, $htmlname:expr, $default:expr) => ( fn $attr(self, value: u32) { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let value = if value > 2147483647 { $default @@ -176,8 +176,8 @@ macro_rules! make_uint_setter( macro_rules! make_limited_uint_setter( ($attr:ident, $htmlname:expr, $default:expr) => ( fn $attr(self, value: u32) -> $crate::dom::bindings::error::ErrorResult { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let value = if value == 0 { return Err($crate::dom::bindings::error::Error::IndexSize); @@ -204,8 +204,8 @@ macro_rules! make_limited_uint_setter( macro_rules! make_atomic_setter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self, value: DOMString) { - use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; + use dom::element::AttributeHandlers; use string_cache::Atom; let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index 0a15c8ad640..08cd4543e54 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -14,10 +14,10 @@ use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable}; use dom::eventtarget::EventTarget; use dom::uievent::{UIEvent, UIEventTypeId}; use dom::window::Window; -use util::opts; -use util::str::DOMString; use std::cell::Cell; use std::default::Default; +use util::opts; +use util::str::DOMString; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/navigatorinfo.rs b/components/script/dom/navigatorinfo.rs index 4982908969b..d47b02f21dd 100644 --- a/components/script/dom/navigatorinfo.rs +++ b/components/script/dom/navigatorinfo.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use util::str::DOMString; use util::opts; +use util::str::DOMString; use std::borrow::ToOwned; diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 6ca62f181e3..5b482c817b9 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -4,6 +4,7 @@ //! The core DOM types. Defines the basic DOM hierarchy as well as all the HTML elements. +use devtools_traits::NodeInfo; use document_loader::DocumentLoader; use dom::attr::{Attr, AttrHelpers}; use dom::bindings::cell::DOMRefCell; @@ -22,12 +23,12 @@ use dom::bindings::codegen::InheritTypes::{HTMLOptGroupElementDerived, NodeBase, use dom::bindings::codegen::InheritTypes::{ProcessingInstructionCast, TextCast, TextDerived}; use dom::bindings::codegen::UnionTypes::NodeOrString; use dom::bindings::conversions; -use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::error::Error::{NotFound, HierarchyRequest, Syntax}; +use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{JS, LayoutJS, MutNullableHeap}; use dom::bindings::js::Root; use dom::bindings::js::RootedReference; +use dom::bindings::js::{JS, LayoutJS, MutNullableHeap}; use dom::bindings::trace::JSTraceable; use dom::bindings::trace::RootedVec; use dom::bindings::utils::{namespace_from_domstring, Reflectable, reflect_dom_object}; @@ -36,8 +37,8 @@ use dom::comment::Comment; use dom::document::{Document, DocumentHelpers, IsHTMLDocument, DocumentSource}; use dom::documentfragment::DocumentFragment; use dom::documenttype::DocumentType; -use dom::element::{AttributeHandlers, Element, ElementCreator, ElementTypeId}; use dom::element::ElementHelpers; +use dom::element::{AttributeHandlers, Element, ElementCreator, ElementTypeId}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::htmlelement::HTMLElementTypeId; use dom::nodelist::{NodeList, NodeListHelpers}; @@ -47,19 +48,18 @@ use dom::virtualmethods::{VirtualMethods, vtable_for}; use dom::window::{Window, WindowHelpers}; use euclid::rect::Rect; use layout_interface::{LayoutChan, Msg}; -use devtools_traits::NodeInfo; use parse::html::parse_html_fragment; use script_traits::UntrustedNodeAddress; -use util::geometry::Au; -use util::str::DOMString; -use util::task_state; +use selectors::matching::matches; use selectors::parser::Selector; use selectors::parser::parse_author_origin_selector_list_from_str; -use selectors::matching::matches; use style::properties::ComputedValues; +use util::geometry::Au; +use util::str::DOMString; +use util::task_state; -use js::jsapi::{JSContext, JSObject, JSRuntime}; use core::nonzero::NonZero; +use js::jsapi::{JSContext, JSObject, JSRuntime}; use libc; use libc::{uintptr_t, c_void}; use std::borrow::ToOwned; @@ -69,8 +69,8 @@ use std::iter::{FilterMap, Peekable}; use std::mem; use std::slice::ref_slice; use std::sync::Arc; -use uuid; use string_cache::{Atom, Namespace, QualName}; +use uuid; // // The basic Node structure diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs index 0958bfca992..d1194c1326a 100644 --- a/components/script/dom/nodeiterator.rs +++ b/components/script/dom/nodeiterator.rs @@ -3,11 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::callback::ExceptionHandling::Rethrow; -use dom::bindings::codegen::Bindings::NodeIteratorBinding; -use dom::bindings::codegen::Bindings::NodeIteratorBinding::NodeIteratorMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilterConstants; +use dom::bindings::codegen::Bindings::NodeIteratorBinding; +use dom::bindings::codegen::Bindings::NodeIteratorBinding::NodeIteratorMethods; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, MutHeap, Root}; diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index 78af618eff5..c0e832e7ae4 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -6,13 +6,13 @@ use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods use dom::bindings::codegen::Bindings::NodeBinding::NodeConstants; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods; -use dom::bindings::codegen::Bindings::RangeBinding::{self, RangeConstants}; use dom::bindings::codegen::Bindings::RangeBinding::RangeMethods; +use dom::bindings::codegen::Bindings::RangeBinding::{self, RangeConstants}; use dom::bindings::codegen::Bindings::TextBinding::TextMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::codegen::InheritTypes::{CharacterDataCast, NodeCast, TextCast}; -use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::error::Error::HierarchyRequest; +use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, Root, RootedReference}; use dom::bindings::utils::{Reflector, reflect_dom_object}; diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs index b9ccd50632f..63cb459379f 100644 --- a/components/script/dom/servohtmlparser.rs +++ b/components/script/dom/servohtmlparser.rs @@ -9,9 +9,9 @@ use document_loader::LoadType; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::ServoHTMLParserBinding; use dom::bindings::global::GlobalRef; -use dom::bindings::trace::JSTraceable; use dom::bindings::js::{JS, Root}; use dom::bindings::refcounted::Trusted; +use dom::bindings::trace::JSTraceable; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::document::{Document, DocumentHelpers}; use dom::node::{window_from_node, Node}; @@ -25,15 +25,15 @@ use net_traits::{Metadata, AsyncResponseListener}; use encoding::all::UTF_8; use encoding::types::{Encoding, DecoderTrap}; -use std::cell::{Cell, RefCell}; -use std::default::Default; -use url::Url; -use js::jsapi::JSTracer; use html5ever::tokenizer; use html5ever::tree_builder; use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts}; use hyper::header::ContentType; use hyper::mime::{Mime, TopLevel, SubLevel}; +use js::jsapi::JSTracer; +use std::cell::{Cell, RefCell}; +use std::default::Default; +use url::Url; #[must_root] #[derive(JSTraceable, HeapSizeOf)] diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index 7231d10247d..ca47bb76c03 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -4,23 +4,23 @@ use dom::bindings::codegen::Bindings::StorageBinding; use dom::bindings::codegen::Bindings::StorageBinding::StorageMethods; +use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast}; use dom::bindings::global::{GlobalRef, GlobalField}; use dom::bindings::js::{Root, RootedReference}; use dom::bindings::refcounted::Trusted; use dom::bindings::utils::{Reflector, reflect_dom_object}; -use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast}; use dom::event::{EventHelpers, EventBubbles, EventCancelable}; use dom::storageevent::StorageEvent; use dom::urlhelper::UrlHelper; use dom::window::WindowHelpers; use ipc_channel::ipc; -use util::str::DOMString; -use page::IterablePage; use net_traits::storage_task::{StorageTask, StorageTaskMsg, StorageType}; +use page::IterablePage; use script_task::{ScriptTask, MainThreadRunnable, MainThreadScriptMsg}; use std::borrow::ToOwned; use std::sync::mpsc::channel; use url::Url; +use util::str::DOMString; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index d783e876b98..e61b12eee7b 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -4,11 +4,11 @@ // check-tidy: no specs after this line +use dom::bindings::codegen::Bindings::EventListenerBinding::EventListener; +use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::Bindings::TestBindingBinding::TestBindingMethods; use dom::bindings::codegen::Bindings::TestBindingBinding::TestEnum; use dom::bindings::codegen::Bindings::TestBindingBinding::TestEnum::_empty; -use dom::bindings::codegen::Bindings::EventListenerBinding::EventListener; -use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::UnionTypes::BlobOrString; use dom::bindings::codegen::UnionTypes::EventOrString; use dom::bindings::codegen::UnionTypes::EventOrString::eString; diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs index e2fed3be09c..d5f314ab0c6 100644 --- a/components/script/dom/text.rs +++ b/components/script/dom/text.rs @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::Bindings::TextBinding::{self, TextMethods}; use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; +use dom::bindings::codegen::Bindings::TextBinding::{self, TextMethods}; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; -use dom::bindings::codegen::InheritTypes::{CharacterDataCast, TextDerived}; use dom::bindings::codegen::InheritTypes::NodeCast; +use dom::bindings::codegen::InheritTypes::{CharacterDataCast, TextDerived}; use dom::bindings::error::{Error, Fallible}; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{RootedReference}; use dom::bindings::js::Root; +use dom::bindings::js::{RootedReference}; use dom::characterdata::{CharacterData, CharacterDataHelpers, CharacterDataTypeId}; use dom::document::Document; use dom::eventtarget::{EventTarget, EventTargetTypeId}; diff --git a/components/script/dom/textdecoder.rs b/components/script/dom/textdecoder.rs index e83d85072b3..c921dc68289 100644 --- a/components/script/dom/textdecoder.rs +++ b/components/script/dom/textdecoder.rs @@ -14,10 +14,10 @@ use dom::bindings::utils::{Reflector, reflect_dom_object}; use util::str::DOMString; use encoding::Encoding; -use encoding::types::{EncodingRef, DecoderTrap}; use encoding::label::encoding_from_whatwg_label; -use js::jsapi::{JSContext, JSObject}; +use encoding::types::{EncodingRef, DecoderTrap}; use js::jsapi::JS_GetObjectAsArrayBufferView; +use js::jsapi::{JSContext, JSObject}; use std::borrow::ToOwned; use std::ptr; diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs index 1b76de05d0d..47a23681e74 100644 --- a/components/script/dom/textencoder.rs +++ b/components/script/dom/textencoder.rs @@ -4,9 +4,9 @@ use dom::bindings::codegen::Bindings::TextEncoderBinding; use dom::bindings::codegen::Bindings::TextEncoderBinding::TextEncoderMethods; -use dom::bindings::global::GlobalRef; -use dom::bindings::error::Fallible; use dom::bindings::error::Error::Range; +use dom::bindings::error::Fallible; +use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; use dom::bindings::str::USVString; use dom::bindings::utils::{Reflector, reflect_dom_object}; @@ -16,13 +16,13 @@ use util::str::DOMString; use std::borrow::ToOwned; use std::ptr; +use encoding::label::encoding_from_whatwg_label; use encoding::types::EncodingRef; use encoding::{Encoding, EncoderTrap}; -use encoding::label::encoding_from_whatwg_label; -use libc::uint8_t; use js::jsapi::{JSContext, JSObject}; use js::jsapi::{JS_NewUint8Array, JS_GetUint8ArrayData}; +use libc::uint8_t; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index b8271909505..cc90a0ab23e 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -3,15 +3,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::callback::ExceptionHandling::Rethrow; -use dom::bindings::codegen::Bindings::TreeWalkerBinding; -use dom::bindings::codegen::Bindings::TreeWalkerBinding::TreeWalkerMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilterConstants; +use dom::bindings::codegen::Bindings::TreeWalkerBinding; +use dom::bindings::codegen::Bindings::TreeWalkerBinding::TreeWalkerMethods; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{JS, MutHeap}; use dom::bindings::js::Root; +use dom::bindings::js::{JS, MutHeap}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::document::{Document, DocumentHelpers}; use dom::node::Node; diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index b9d66082594..abccf1abcd2 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -8,8 +8,8 @@ use dom::bindings::codegen::Bindings::UIEventBinding::UIEventMethods; use dom::bindings::codegen::InheritTypes::{EventCast, UIEventDerived}; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{JS, MutNullableHeap, RootedReference}; use dom::bindings::js::Root; +use dom::bindings::js::{JS, MutNullableHeap, RootedReference}; use dom::bindings::utils::reflect_dom_object; use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable}; diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs index d4a8b5a23ff..daba091955c 100644 --- a/components/script/dom/url.rs +++ b/components/script/dom/url.rs @@ -6,8 +6,8 @@ use dom::bindings::codegen::Bindings::URLBinding::{self, URLMethods}; use dom::bindings::error::{Error, Fallible}; use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; -use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::bindings::str::USVString; +use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::urlhelper::UrlHelper; use url::{Host, Url, UrlParser}; diff --git a/components/script/dom/userscripts.rs b/components/script/dom/userscripts.rs index a71ead38e52..c8fce99002c 100644 --- a/components/script/dom/userscripts.rs +++ b/components/script/dom/userscripts.rs @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; +use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::InheritTypes::NodeCast; use dom::bindings::js::{RootedReference}; use dom::element::AttributeHandlers; use dom::htmlheadelement::HTMLHeadElement; use dom::node::NodeHelpers; -use util::opts; -use util::resource_files::resources_dir_path; use std::borrow::ToOwned; use std::fs::read_dir; use std::path::PathBuf; +use util::opts; +use util::resource_files::resources_dir_path; pub fn load_script(head: &HTMLHeadElement) { diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs index 437f39422c6..22f33d63201 100644 --- a/components/script/dom/virtualmethods.rs +++ b/components/script/dom/virtualmethods.rs @@ -5,8 +5,8 @@ use dom::attr::{Attr, AttrValue}; use dom::bindings::codegen::InheritTypes::ElementCast; use dom::bindings::codegen::InheritTypes::HTMLAnchorElementCast; -use dom::bindings::codegen::InheritTypes::HTMLAreaElementCast; use dom::bindings::codegen::InheritTypes::HTMLAppletElementCast; +use dom::bindings::codegen::InheritTypes::HTMLAreaElementCast; use dom::bindings::codegen::InheritTypes::HTMLBaseElementCast; use dom::bindings::codegen::InheritTypes::HTMLBodyElementCast; use dom::bindings::codegen::InheritTypes::HTMLButtonElementCast; @@ -26,8 +26,8 @@ use dom::bindings::codegen::InheritTypes::HTMLOptionElementCast; use dom::bindings::codegen::InheritTypes::HTMLScriptElementCast; use dom::bindings::codegen::InheritTypes::HTMLSelectElementCast; use dom::bindings::codegen::InheritTypes::HTMLStyleElementCast; -use dom::bindings::codegen::InheritTypes::HTMLTableElementCast; use dom::bindings::codegen::InheritTypes::HTMLTableCellElementCast; +use dom::bindings::codegen::InheritTypes::HTMLTableElementCast; use dom::bindings::codegen::InheritTypes::HTMLTableRowElementCast; use dom::bindings::codegen::InheritTypes::HTMLTableSectionElementCast; use dom::bindings::codegen::InheritTypes::HTMLTextAreaElementCast; @@ -36,8 +36,8 @@ use dom::document::Document; use dom::element::ElementTypeId; use dom::event::Event; use dom::htmlelement::HTMLElementTypeId; -use dom::node::{ChildrenMutation, CloneChildrenFlag, Node, NodeHelpers}; use dom::node::NodeTypeId; +use dom::node::{ChildrenMutation, CloneChildrenFlag, Node, NodeHelpers}; use util::str::DOMString; diff --git a/components/script/dom/webglobject.rs b/components/script/dom/webglobject.rs index 46ac7d81d80..ea31d7364e7 100644 --- a/components/script/dom/webglobject.rs +++ b/components/script/dom/webglobject.rs @@ -5,8 +5,8 @@ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl use dom::bindings::codegen::Bindings::WebGLObjectBinding; use dom::bindings::global::GlobalRef; -use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::bindings::js::Root; +use dom::bindings::utils::{Reflector, reflect_dom_object}; #[dom_struct] #[derive(HeapSizeOf)] diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs index 0c93aba3b5b..e4f598285d3 100644 --- a/components/script/dom/webglprogram.rs +++ b/components/script/dom/webglprogram.rs @@ -8,8 +8,8 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::utils::reflect_dom_object; use dom::webglobject::WebGLObject; -use dom::webglshader::{WebGLShader, WebGLShaderHelpers}; use dom::webglrenderingcontext::MAX_UNIFORM_AND_ATTRIBUTE_LEN; +use dom::webglshader::{WebGLShader, WebGLShaderHelpers}; use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants; diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 4acf36256c8..356e556eaa6 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -9,17 +9,17 @@ use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding:: {self, WebGLContextAttributes, WebGLRenderingContextMethods}; use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants; +use dom::bindings::conversions::ToJSValConvertible; use dom::bindings::global::{GlobalRef, GlobalField}; use dom::bindings::js::{JS, LayoutJS, Root}; use dom::bindings::utils::{Reflector, reflect_dom_object}; -use dom::bindings::conversions::ToJSValConvertible; use dom::htmlcanvaselement::{HTMLCanvasElement}; use dom::webglbuffer::{WebGLBuffer, WebGLBufferHelpers}; use dom::webglframebuffer::{WebGLFramebuffer, WebGLFramebufferHelpers}; +use dom::webglprogram::{WebGLProgram, WebGLProgramHelpers}; use dom::webglrenderbuffer::{WebGLRenderbuffer, WebGLRenderbufferHelpers}; -use dom::webgltexture::{WebGLTexture, WebGLTextureHelpers}; use dom::webglshader::{WebGLShader, WebGLShaderHelpers}; -use dom::webglprogram::{WebGLProgram, WebGLProgramHelpers}; +use dom::webgltexture::{WebGLTexture, WebGLTextureHelpers}; use dom::webgluniformlocation::{WebGLUniformLocation, WebGLUniformLocationHelpers}; use euclid::size::Size2D; use ipc_channel::ipc::{self, IpcSender}; @@ -27,13 +27,13 @@ use js::jsapi::{JSContext, JSObject, RootedValue}; use js::jsapi::{JS_GetFloat32ArrayData, JS_GetObjectAsArrayBufferView}; use js::jsval::{JSVal, UndefinedValue, NullValue, Int32Value, BooleanValue}; use msg::constellation_msg::Msg as ConstellationMsg; +use offscreen_gl_context::GLContextAttributes; use std::cell::Cell; use std::mem; use std::ptr; use std::slice; use std::sync::mpsc::channel; use util::str::DOMString; -use offscreen_gl_context::GLContextAttributes; pub const MAX_UNIFORM_AND_ATTRIBUTE_LEN: usize = 256; diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 1e00a9e507a..9bd0610d666 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -3,14 +3,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::cell::DOMRefCell; +use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::WebSocketBinding; use dom::bindings::codegen::Bindings::WebSocketBinding::{BinaryType, WebSocketMethods}; -use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; -use dom::bindings::codegen::InheritTypes::EventTargetCast; use dom::bindings::codegen::InheritTypes::EventCast; +use dom::bindings::codegen::InheritTypes::EventTargetCast; use dom::bindings::conversions::ToJSValConvertible; -use dom::bindings::error::{Error, Fallible}; use dom::bindings::error::Error::{InvalidAccess, Syntax}; +use dom::bindings::error::{Error, Fallible}; use dom::bindings::global::{GlobalField, GlobalRef}; use dom::bindings::js::Root; use dom::bindings::refcounted::Trusted; @@ -28,21 +28,21 @@ use net_traits::hosts::replace_hosts; use util::str::DOMString; use util::task::spawn_named; -use js::jsapi::{RootedValue, JSAutoRequest, JSAutoCompartment}; +use hyper::header::Host; use js::jsapi::{JS_NewArrayBuffer, JS_GetArrayBufferData}; +use js::jsapi::{RootedValue, JSAutoRequest, JSAutoCompartment}; use js::jsval::UndefinedValue; -use hyper::header::Host; use libc::{uint8_t, uint32_t}; +use websocket::Client; use websocket::Message; -use websocket::ws::sender::Sender as Sender_Object; -use websocket::client::sender::Sender; use websocket::client::receiver::Receiver; -use websocket::stream::WebSocketStream; use websocket::client::request::Url; -use websocket::Client; +use websocket::client::sender::Sender; use websocket::header::Origin; use websocket::result::WebSocketResult; +use websocket::stream::WebSocketStream; use websocket::ws::receiver::Receiver as WSReceiver; +use websocket::ws::sender::Sender as Sender_Object; use websocket::ws::util::url::parse_url; use std::borrow::ToOwned; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 82e3247dc8e..ae9a0500c9e 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::cell::DOMRefCell; use dom::bindings::callback::ExceptionHandling; -use dom::bindings::codegen::Bindings::EventHandlerBinding::{OnErrorEventHandlerNonNull, EventHandlerNonNull}; +use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; +use dom::bindings::codegen::Bindings::EventHandlerBinding::{OnErrorEventHandlerNonNull, EventHandlerNonNull}; use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::Bindings::WindowBinding::{self, WindowMethods, FrameRequestCallback}; use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast, EventTargetCast, WindowDerived}; -use dom::bindings::global::global_object_for_js_object; -use dom::bindings::error::{report_pending_exception, Fallible}; use dom::bindings::error::Error::InvalidCharacter; +use dom::bindings::error::{report_pending_exception, Fallible}; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{JS, Root, MutNullableHeap}; +use dom::bindings::global::global_object_for_js_object; use dom::bindings::js::RootedReference; +use dom::bindings::js::{JS, Root, MutNullableHeap}; use dom::bindings::num::Finite; use dom::bindings::utils::{GlobalStaticData, Reflectable, WindowProxyHandler}; use dom::browsercontext::BrowsingContext; @@ -31,11 +31,11 @@ use dom::node::{window_from_node, TrustedNodeAddress, NodeHelpers, from_untruste use dom::performance::Performance; use dom::screen::Screen; use dom::storage::Storage; -use layout_interface::{ReflowGoal, ReflowQueryType, LayoutRPC, LayoutChan, Reflow, Msg}; use layout_interface::{ContentBoxResponse, ContentBoxesResponse, ResolvedStyleResponse, ScriptReflow}; +use layout_interface::{ReflowGoal, ReflowQueryType, LayoutRPC, LayoutChan, Reflow, Msg}; use page::Page; -use script_task::{TimerSource, ScriptChan, ScriptPort, MainThreadScriptMsg}; use script_task::{SendableMainThreadScriptChan, MainThreadScriptChan}; +use script_task::{TimerSource, ScriptChan, ScriptPort, MainThreadScriptMsg}; use script_traits::ConstellationControlMsg; use timers::{IsInterval, TimerId, TimerManager, TimerCallback}; use webdriver_handlers::jsval_to_webdriver; @@ -51,16 +51,16 @@ use net_traits::storage_task::{StorageTask, StorageType}; use profile_traits::mem; use string_cache::Atom; use util::geometry::{self, Au, MAX_RECT}; -use util::{breakpoint, opts}; use util::str::{DOMString, HTML_SPACE_CHARACTERS}; +use util::{breakpoint, opts}; use euclid::{Point2D, Rect, Size2D}; use ipc_channel::ipc::IpcSender; use js::jsapi::{Evaluate2, MutableHandleValue}; use js::jsapi::{JSContext, HandleValue}; use js::jsapi::{JS_GC, JS_GetRuntime, JSAutoCompartment, JSAutoRequest}; -use js::rust::Runtime; use js::rust::CompileOptionsWrapper; +use js::rust::Runtime; use selectors::parser::PseudoElement; use url::Url; diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 7ecbcaa864c..fe4d5aecaf6 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -2,32 +2,32 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::WorkerBinding; use dom::bindings::codegen::Bindings::WorkerBinding::WorkerMethods; -use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast}; -use dom::bindings::error::{Fallible, ErrorResult}; use dom::bindings::error::Error::Syntax; +use dom::bindings::error::{Fallible, ErrorResult}; use dom::bindings::global::{GlobalRef, GlobalField}; +use dom::bindings::js::Root; use dom::bindings::refcounted::Trusted; use dom::bindings::structuredclone::StructuredCloneData; use dom::bindings::trace::JSTraceable; use dom::bindings::utils::{Reflectable, reflect_dom_object}; -use dom::bindings::js::Root; -use dom::window::WindowHelpers; use dom::dedicatedworkerglobalscope::{DedicatedWorkerGlobalScope, WorkerScriptMsg}; use dom::errorevent::ErrorEvent; use dom::event::{Event, EventBubbles, EventCancelable, EventHelpers}; use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; use dom::messageevent::MessageEvent; +use dom::window::WindowHelpers; use dom::workerglobalscope::WorkerGlobalScopeInit; use devtools_traits::{DevtoolsPageInfo, ScriptToDevtoolsControlMsg}; use script_task::{ScriptChan, Runnable}; use ipc_channel::ipc; -use js::jsapi::{JSContext, HandleValue, RootedValue}; use js::jsapi::{JSAutoRequest, JSAutoCompartment}; +use js::jsapi::{JSContext, HandleValue, RootedValue}; use js::jsval::UndefinedValue; use url::UrlParser; use util::str::DOMString; diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 468de091271..33201a35509 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -5,8 +5,8 @@ use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods; use dom::bindings::codegen::InheritTypes::DedicatedWorkerGlobalScopeCast; -use dom::bindings::error::{ErrorResult, Fallible, report_pending_exception}; use dom::bindings::error::Error::{Syntax, Network, JSFailed}; +use dom::bindings::error::{ErrorResult, Fallible, report_pending_exception}; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, Root, MutNullableHeap}; use dom::bindings::utils::Reflectable; @@ -14,17 +14,17 @@ use dom::console::Console; use dom::crypto::Crypto; use dom::dedicatedworkerglobalscope::DedicatedWorkerGlobalScopeHelpers; use dom::eventtarget::{EventTarget, EventTargetTypeId}; +use dom::window::{base64_atob, base64_btoa}; use dom::workerlocation::WorkerLocation; use dom::workernavigator::WorkerNavigator; -use dom::window::{base64_atob, base64_btoa}; use script_task::{CommonScriptMsg, ScriptChan, TimerSource, ScriptPort}; use timers::{IsInterval, TimerId, TimerManager, TimerCallback}; use devtools_traits::{ScriptToDevtoolsControlMsg, DevtoolScriptControlMsg}; use msg::constellation_msg::{ConstellationChan, PipelineId, WorkerId}; -use profile_traits::mem; use net_traits::{load_whole_resource, ResourceTask}; +use profile_traits::mem; use util::str::DOMString; use ipc_channel::ipc::IpcSender; @@ -32,8 +32,8 @@ use js::jsapi::{JSContext, HandleValue, JSAutoRequest}; use js::rust::Runtime; use url::{Url, UrlParser}; -use std::default::Default; use std::cell::Cell; +use std::default::Default; use std::rc::Rc; use std::sync::mpsc::Receiver; diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs index fa52ce1dcf4..f4f9209445a 100644 --- a/components/script/dom/workerlocation.rs +++ b/components/script/dom/workerlocation.rs @@ -4,8 +4,8 @@ use dom::bindings::codegen::Bindings::WorkerLocationBinding; use dom::bindings::codegen::Bindings::WorkerLocationBinding::WorkerLocationMethods; -use dom::bindings::js::Root; use dom::bindings::global::GlobalRef; +use dom::bindings::js::Root; use dom::bindings::str::USVString; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::urlhelper::UrlHelper; diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 577416fe700..40325fdcf49 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -10,12 +10,12 @@ use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestRespo use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestResponseType::{_empty, Json, Text}; use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast, XMLHttpRequestDerived}; use dom::bindings::conversions::ToJSValConvertible; -use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::error::Error::{InvalidState, InvalidAccess}; use dom::bindings::error::Error::{Network, Syntax, Security, Abort, Timeout}; +use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::global::{GlobalField, GlobalRef, GlobalRoot}; -use dom::bindings::js::{JS, MutNullableHeap}; use dom::bindings::js::Root; +use dom::bindings::js::{JS, MutNullableHeap}; use dom::bindings::refcounted::Trusted; use dom::bindings::str::ByteString; use dom::bindings::utils::{Reflectable, reflect_dom_object}; @@ -37,18 +37,18 @@ use encoding::types::{DecoderTrap, Encoding, EncodingRef, EncoderTrap}; use hyper::header::Headers; use hyper::header::{Accept, ContentLength, ContentType, qitem}; use hyper::http::RawStatus; -use hyper::mime::{self, Mime}; use hyper::method::Method; +use hyper::mime::{self, Mime}; -use js::jsapi::{JS_ParseJSON, JSContext, RootedValue}; use js::jsapi::JS_ClearPendingException; +use js::jsapi::{JS_ParseJSON, JSContext, RootedValue}; use js::jsval::{JSVal, NullValue, UndefinedValue}; +use cors::CORSResponse; +use cors::{allow_cross_origin_request, CORSRequest, RequestMode, AsyncCORSResponseListener}; use net_traits::ControlMsg::Load; -use net_traits::{ResourceTask, ResourceCORSData, LoadData, LoadConsumer}; use net_traits::{AsyncResponseListener, AsyncResponseTarget, Metadata}; -use cors::{allow_cross_origin_request, CORSRequest, RequestMode, AsyncCORSResponseListener}; -use cors::CORSResponse; +use net_traits::{ResourceTask, ResourceCORSData, LoadData, LoadConsumer}; use util::mem::HeapSizeOf; use util::str::DOMString; use util::task::spawn_named; @@ -59,8 +59,8 @@ use std::ascii::AsciiExt; use std::borrow::ToOwned; use std::cell::{RefCell, Cell}; use std::default::Default; -use std::sync::{Mutex, Arc}; use std::sync::mpsc::{channel, Sender, TryRecvError}; +use std::sync::{Mutex, Arc}; use std::thread::sleep_ms; use time; use url::{Url, UrlParser}; @@ -1052,10 +1052,10 @@ impl<'a> PrivateXMLHttpRequestHelpers for &'a XMLHttpRequest { } fn filter_response_headers(self) -> Headers { // https://fetch.spec.whatwg.org/#concept-response-header-list - use std::fmt; - use hyper::header::{Header, HeaderFormat}; - use hyper::header::SetCookie; use hyper::error::Result; + use hyper::header::SetCookie; + use hyper::header::{Header, HeaderFormat}; + use std::fmt; // a dummy header so we can use headers.remove::<SetCookie2>() #[derive(Clone, Debug, HeapSizeOf)] diff --git a/components/script/dom/xmlhttprequestupload.rs b/components/script/dom/xmlhttprequestupload.rs index 02e1b38deae..5753117863b 100644 --- a/components/script/dom/xmlhttprequestupload.rs +++ b/components/script/dom/xmlhttprequestupload.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::InheritTypes::XMLHttpRequestUploadDerived; use dom::bindings::codegen::Bindings::XMLHttpRequestUploadBinding; +use dom::bindings::codegen::InheritTypes::XMLHttpRequestUploadDerived; use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; use dom::bindings::utils::reflect_dom_object; diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index 8a93faa8fe2..053c58dc387 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -12,12 +12,12 @@ use euclid::point::Point2D; use euclid::rect::Rect; use ipc_channel::ipc::{IpcReceiver, IpcSender}; use libc::uintptr_t; +use msg::compositor_msg::Epoch; use msg::compositor_msg::LayerId; use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId}; use msg::constellation_msg::{WindowSizeData}; -use msg::compositor_msg::Epoch; -use net_traits::image_cache_task::ImageCacheTask; use net_traits::PendingAsyncLoad; +use net_traits::image_cache_task::ImageCacheTask; use profile_traits::mem::ReportsChan; use script_traits::{ConstellationControlMsg, LayoutControlMsg}; use script_traits::{OpaqueScriptLayoutChannel, StylesheetLoadResponder, UntrustedNodeAddress}; diff --git a/components/script/network_listener.rs b/components/script/network_listener.rs index e8b2e9f59ba..a65fec9a689 100644 --- a/components/script/network_listener.rs +++ b/components/script/network_listener.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use script_task::{ScriptChan, Runnable, CommonScriptMsg}; use net_traits::{AsyncResponseListener, ResponseAction}; +use script_task::{ScriptChan, Runnable, CommonScriptMsg}; use std::sync::{Arc, Mutex}; /// An off-thread sink for async network event runnables. All such events are forwarded to diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index cd4e6dd1d47..872fd334ab4 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -8,10 +8,10 @@ use document_loader::DocumentLoader; use dom::attr::AttrHelpers; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; +use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast; use dom::bindings::codegen::InheritTypes::{CharacterDataCast, DocumentTypeCast}; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLScriptElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLFormElementDerived, NodeCast}; -use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast; use dom::bindings::js::{JS, Root}; use dom::bindings::js::{RootedReference}; use dom::characterdata::{CharacterDataHelpers, CharacterDataTypeId}; @@ -32,18 +32,18 @@ use parse::Parser; use encoding::types::Encoding; -use msg::constellation_msg::PipelineId; -use util::str::DOMString; -use std::borrow::Cow; -use std::io::{self, Write}; -use url::Url; use html5ever::Attribute; -use html5ever::serialize::{Serializable, Serializer, AttrRef}; use html5ever::serialize::TraversalScope; use html5ever::serialize::TraversalScope::{IncludeNode, ChildrenOnly}; +use html5ever::serialize::{Serializable, Serializer, AttrRef}; use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText, NextParserState}; +use msg::constellation_msg::PipelineId; +use std::borrow::Cow; +use std::io::{self, Write}; use string_cache::QualName; use tendril::StrTendril; +use url::Url; +use util::str::DOMString; trait SinkHelpers { fn get_or_create(&self, child: NodeOrText<JS<Node>>) -> Root<Node>; diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 438efaed0b1..17e0a58314f 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -19,6 +19,7 @@ #![allow(unsafe_code)] +use devtools; use document_loader::{LoadType, DocumentLoader, NotifierData}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; @@ -37,47 +38,46 @@ use dom::document::{DocumentProgressTask, DocumentSource, MouseEventType}; use dom::element::{Element, AttributeHandlers}; use dom::event::{EventHelpers, EventBubbles, EventCancelable}; use dom::htmliframeelement::HTMLIFrameElementHelpers; -use dom::uievent::UIEvent; use dom::node::{Node, NodeHelpers, NodeDamage, window_from_node}; use dom::servohtmlparser::{ServoHTMLParser, ParserContext}; +use dom::uievent::UIEvent; use dom::window::{Window, WindowHelpers, ScriptHelpers, ReflowReason}; use dom::worker::TrustedWorkerAddress; -use parse::html::{ParseContext, parse_html}; -use layout_interface::{self, NewLayoutTaskInfo, ScriptLayoutChan, LayoutChan, ReflowGoal}; use layout_interface::{ReflowQueryType}; +use layout_interface::{self, NewLayoutTaskInfo, ScriptLayoutChan, LayoutChan, ReflowGoal}; use mem::heap_size_of_eventtarget; use network_listener::NetworkListener; use page::{Page, IterablePage, Frame}; +use parse::html::{ParseContext, parse_html}; use timers::TimerId; -use devtools; use webdriver_handlers; use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg}; use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType}; use devtools_traits::{TracingMetadata}; -use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent}; -use script_traits::CompositorEvent::{MouseMoveEvent, KeyEvent}; -use script_traits::CompositorEvent::{ResizeEvent, ClickEvent}; -use script_traits::{CompositorEvent, MouseButton}; -use script_traits::ConstellationControlMsg; -use script_traits::{NewLayoutInfo, OpaqueScriptLayoutChannel}; -use script_traits::{ScriptState, ScriptTaskFactory}; use msg::compositor_msg::{LayerId, ScriptToCompositorMsg}; +use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::{ConstellationChan, FocusType}; -use msg::constellation_msg::{LoadData, PipelineId, SubpageId, MozBrowserEvent, WorkerId}; use msg::constellation_msg::{Failure, WindowSizeData, PipelineExitType}; -use msg::constellation_msg::Msg as ConstellationMsg; +use msg::constellation_msg::{LoadData, PipelineId, SubpageId, MozBrowserEvent, WorkerId}; use msg::webdriver_msg::WebDriverScriptCommand; use net_traits::LoadData as NetLoadData; -use net_traits::{AsyncResponseTarget, ResourceTask, LoadConsumer, ControlMsg, Metadata}; use net_traits::image_cache_task::{ImageCacheChan, ImageCacheTask, ImageCacheResult}; use net_traits::storage_task::StorageTask; +use net_traits::{AsyncResponseTarget, ResourceTask, LoadConsumer, ControlMsg, Metadata}; use profile_traits::mem::{self, Report, ReportKind, ReportsChan, OpaqueSender}; +use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent}; +use script_traits::CompositorEvent::{MouseMoveEvent, KeyEvent}; +use script_traits::CompositorEvent::{ResizeEvent, ClickEvent}; +use script_traits::ConstellationControlMsg; +use script_traits::{CompositorEvent, MouseButton}; +use script_traits::{NewLayoutInfo, OpaqueScriptLayoutChannel}; +use script_traits::{ScriptState, ScriptTaskFactory}; use string_cache::Atom; +use util::opts; use util::str::DOMString; use util::task::spawn_named_with_send_on_failure; use util::task_state; -use util::opts; use euclid::Rect; use euclid::point::Point2D; @@ -86,11 +86,11 @@ use hyper::method::Method; use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::router::ROUTER; use js::glue::CollectServoSizes; -use js::jsapi::{JS_SetWrapObjectCallbacks, JS_AddExtraGCRootsTracer, DisableIncrementalGC}; use js::jsapi::{JSContext, JSRuntime, JSTracer}; +use js::jsapi::{JSGCInvocationKind, GCDescription, SetGCSliceCallback, GCProgress}; use js::jsapi::{JS_GetRuntime, JS_SetGCCallback, JSGCStatus, JSAutoRequest, SetDOMCallbacks}; +use js::jsapi::{JS_SetWrapObjectCallbacks, JS_AddExtraGCRootsTracer, DisableIncrementalGC}; use js::jsapi::{SetDOMProxyInformation, DOMProxyShadowsResult, HandleObject, HandleId, RootedValue}; -use js::jsapi::{JSGCInvocationKind, GCDescription, SetGCSliceCallback, GCProgress}; use js::jsval::UndefinedValue; use js::rust::Runtime; use url::{Url, UrlParser}; @@ -106,8 +106,8 @@ use std::option::Option; use std::ptr; use std::rc::Rc; use std::result::Result; -use std::sync::{Arc, Mutex}; use std::sync::mpsc::{channel, Sender, Receiver, Select}; +use std::sync::{Arc, Mutex}; use time::{self, Tm}; use hyper::header::{ContentType, HttpDate}; diff --git a/components/script/textinput.rs b/components/script/textinput.rs index 5ecf6a4f312..b2c2afdec0f 100644 --- a/components/script/textinput.rs +++ b/components/script/textinput.rs @@ -6,8 +6,8 @@ use clipboard_provider::ClipboardProvider; use dom::keyboardevent::{KeyboardEvent, KeyboardEventHelpers, key_value}; -use msg::constellation_msg::{SHIFT, CONTROL, ALT, SUPER}; use msg::constellation_msg::{Key, KeyModifiers}; +use msg::constellation_msg::{SHIFT, CONTROL, ALT, SUPER}; use util::mem::HeapSizeOf; use util::str::{DOMString, slice_chars}; diff --git a/components/script/timers.rs b/components/script/timers.rs index 8cc317f83ac..f18b2231417 100644 --- a/components/script/timers.rs +++ b/components/script/timers.rs @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::cell::DOMRefCell; use dom::bindings::callback::ExceptionHandling::Report; +use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::global::global_object_for_js_object; use dom::bindings::utils::Reflectable; use dom::window::ScriptHelpers; -use script_task::{ScriptChan, TimerSource, CommonScriptMsg}; use horribly_inefficient_timers; +use script_task::{ScriptChan, TimerSource, CommonScriptMsg}; use util::mem::HeapSizeOf; -use util::task::spawn_named; use util::str::DOMString; +use util::task::spawn_named; use js::jsapi::{RootedValue, HandleValue, Heap}; use js::jsval::{JSVal, UndefinedValue}; @@ -23,11 +23,11 @@ use std::borrow::ToOwned; use std::cell::Cell; use std::cmp; use std::collections::HashMap; -use std::sync::mpsc::{channel, Sender}; -use std::sync::mpsc::Select; +use std::default::Default; use std::hash::{Hash, Hasher}; use std::rc::Rc; -use std::default::Default; +use std::sync::mpsc::Select; +use std::sync::mpsc::{channel, Sender}; #[derive(JSTraceable, PartialEq, Eq, Copy, Clone, HeapSizeOf)] pub struct TimerId(i32); diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs index 910aadda16d..e25e1fb247c 100644 --- a/components/script/webdriver_handlers.rs +++ b/components/script/webdriver_handlers.rs @@ -2,25 +2,25 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::conversions::FromJSValConvertible; -use dom::bindings::conversions::StringificationBehavior; -use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast, HTMLIFrameElementCast}; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::ElementBinding::ElementMethods; use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods; +use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast, HTMLIFrameElementCast}; +use dom::bindings::conversions::FromJSValConvertible; +use dom::bindings::conversions::StringificationBehavior; use dom::bindings::js::Root; +use dom::document::DocumentHelpers; use dom::node::{Node, NodeHelpers}; use dom::window::{ScriptHelpers, WindowHelpers}; -use dom::document::DocumentHelpers; use js::jsapi::JSContext; -use page::Page; +use js::jsapi::{RootedValue, HandleValue}; +use js::jsval::UndefinedValue; use msg::constellation_msg::{PipelineId, SubpageId}; use msg::webdriver_msg::{WebDriverJSValue, WebDriverJSError, WebDriverJSResult, WebDriverFrameId}; +use page::Page; use script_task::get_page; -use js::jsapi::{RootedValue, HandleValue}; -use js::jsval::UndefinedValue; use ipc_channel::ipc::IpcSender; use std::rc::Rc; |