diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-13 07:09:29 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-13 07:09:29 -0500 |
commit | 34d0e59849a0a3e231e47fe10d66484340b8b80c (patch) | |
tree | 46d0bb5c7f6858eea9ac15c2165df1006c5b4c83 /components/script/dom/document.rs | |
parent | d2fa2ae9343db8d958570a501ff9a7b7a203ceeb (diff) | |
parent | 43ca26068935e014b1a41a6a02f45d05436577b4 (diff) | |
download | servo-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/document.rs')
-rw-r--r-- | components/script/dom/document.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 2043c4ed429..2f0d9dcfde3 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -34,7 +34,6 @@ use dom::bindings::reflector::{DomObject, reflect_dom_object}; use dom::bindings::str::{DOMString, USVString}; use dom::bindings::xmlname::{namespace_from_domstring, validate_and_extract, xml_name_type}; use dom::bindings::xmlname::XMLName::InvalidXMLName; -use dom::browsingcontext::BrowsingContext; use dom::closeevent::CloseEvent; use dom::comment::Comment; use dom::customevent::CustomEvent; @@ -89,6 +88,7 @@ use dom::treewalker::TreeWalker; use dom::uievent::UIEvent; use dom::webglcontextevent::WebGLContextEvent; use dom::window::{ReflowReason, Window}; +use dom::windowproxy::WindowProxy; use dom_struct::dom_struct; use encoding::EncodingRef; use encoding::all::UTF_8; @@ -401,9 +401,9 @@ impl Document { /// https://html.spec.whatwg.org/multipage/#concept-document-bc #[inline] - pub fn browsing_context(&self) -> Option<Root<BrowsingContext>> { + pub fn browsing_context(&self) -> Option<Root<WindowProxy>> { if self.has_browsing_context { - self.window.maybe_browsing_context() + self.window.maybe_window_proxy() } else { None } |