diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-12 14:18:25 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-12 14:18:25 +0530 |
commit | f4783a0ec30c74f93c161372de806309900172ca (patch) | |
tree | 2628f0eec234e8cff176356f64a22eb14dcaccf0 /components/script/dom | |
parent | 23b220644c3cca7e90152c62a04133e72a95570c (diff) | |
parent | b7b5c79787beff957753aad9325a732aa3a7c4b1 (diff) | |
download | servo-f4783a0ec30c74f93c161372de806309900172ca.tar.gz servo-f4783a0ec30c74f93c161372de806309900172ca.zip |
Auto merge of #8942 - Ms2ger:rename-bc, r=nox
Rename the browsercontext module.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8942)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/bindings/utils.rs | 4 | ||||
-rw-r--r-- | components/script/dom/browsingcontext.rs (renamed from components/script/dom/browsercontext.rs) | 0 | ||||
-rw-r--r-- | components/script/dom/mod.rs | 2 | ||||
-rw-r--r-- | components/script/dom/window.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 13dbc46b9dc..9aa4b9cf0b6 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -11,7 +11,7 @@ use dom::bindings::conversions::{private_from_proto_check, root_from_handleobjec use dom::bindings::error::throw_invalid_this; use dom::bindings::inheritance::TopTypeId; use dom::bindings::trace::trace_object; -use dom::browsercontext; +use dom::browsingcontext; use dom::window; use js; use js::error::throw_type_error; @@ -73,7 +73,7 @@ impl GlobalStaticData { /// Creates a new GlobalStaticData. pub fn new() -> GlobalStaticData { GlobalStaticData { - windowproxy_handler: browsercontext::new_window_proxy_handler(), + windowproxy_handler: browsingcontext::new_window_proxy_handler(), } } } diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsingcontext.rs index b63fbaa6fc5..b63fbaa6fc5 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsingcontext.rs diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 0052f8a9cab..5e4c5609735 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -215,7 +215,7 @@ mod create; #[deny(missing_docs, non_snake_case)] pub mod bindings; pub mod blob; -pub mod browsercontext; +pub mod browsingcontext; pub mod canvasgradient; pub mod canvaspattern; pub mod canvasrenderingcontext2d; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index fd471cc4d38..a0ca6cfa432 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -19,7 +19,7 @@ use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::num::Finite; use dom::bindings::reflector::Reflectable; use dom::bindings::utils::{GlobalStaticData, WindowProxyHandler}; -use dom::browsercontext::BrowsingContext; +use dom::browsingcontext::BrowsingContext; use dom::console::Console; use dom::crypto::Crypto; use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration}; |