aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-05-13 07:09:29 -0500
committerGitHub <noreply@github.com>2017-05-13 07:09:29 -0500
commit34d0e59849a0a3e231e47fe10d66484340b8b80c (patch)
tree46d0bb5c7f6858eea9ac15c2165df1006c5b4c83 /components/script/dom/bindings
parentd2fa2ae9343db8d958570a501ff9a7b7a203ceeb (diff)
parent43ca26068935e014b1a41a6a02f45d05436577b4 (diff)
downloadservo-34d0e59849a0a3e231e47fe10d66484340b8b80c.tar.gz
servo-34d0e59849a0a3e231e47fe10d66484340b8b80c.zip
Auto merge of #16845 - asajeffrey:script-rename-browsing-contexts, r=jdm
Renamed BrowsingContext to WindowProxy in script. <!-- Please describe your changes on the following line: --> Renamed `script::dom::BrowsingContext` to `script::dom::WindowProxy`. The browsing context is mostly maintained in the constellation, not in script. It would be nice to rename `constellation::Frame` to `constellation::BrowsingContext`, but that will be very confusing if there are two `BrowsingContext` types. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because renamings aren't externally visible <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16845) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings')
-rw-r--r--components/script/dom/bindings/codegen/Bindings.conf3
-rw-r--r--components/script/dom/bindings/codegen/CodegenRust.py2
-rw-r--r--components/script/dom/bindings/utils.rs4
3 files changed, 4 insertions, 5 deletions
diff --git a/components/script/dom/bindings/codegen/Bindings.conf b/components/script/dom/bindings/codegen/Bindings.conf
index 5647679f446..2f0b8e7b66b 100644
--- a/components/script/dom/bindings/codegen/Bindings.conf
+++ b/components/script/dom/bindings/codegen/Bindings.conf
@@ -34,8 +34,7 @@ DOMInterfaces = {
},
'WindowProxy' : {
- 'nativeType': 'BrowsingContext',
- 'path': 'dom::browsingcontext::BrowsingContext',
+ 'path': 'dom::windowproxy::WindowProxy',
'register': False,
}
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index e7a0541c4da..102c1a17d57 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -5638,7 +5638,7 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
'dom::bindings::weakref::DOM_WEAK_SLOT',
'dom::bindings::weakref::WeakBox',
'dom::bindings::weakref::WeakReferenceable',
- 'dom::browsingcontext::BrowsingContext',
+ 'dom::windowproxy::WindowProxy',
'dom::globalscope::GlobalScope',
'mem::heap_size_of_raw_self_and_children',
'libc',
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index c7039fd168c..4792b6b7655 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -12,7 +12,7 @@ use dom::bindings::error::throw_invalid_this;
use dom::bindings::inheritance::TopTypeId;
use dom::bindings::str::DOMString;
use dom::bindings::trace::trace_object;
-use dom::browsingcontext;
+use dom::windowproxy;
use heapsize::HeapSizeOf;
use js;
use js::JS_CALLEE;
@@ -58,7 +58,7 @@ impl GlobalStaticData {
/// Creates a new GlobalStaticData.
pub fn new() -> GlobalStaticData {
GlobalStaticData {
- windowproxy_handler: browsingcontext::new_window_proxy_handler(),
+ windowproxy_handler: windowproxy::new_window_proxy_handler(),
}
}
}