Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed BrowsingContext to WindowProxy in script. #16845

Merged
merged 1 commit into from May 13, 2017

Conversation

asajeffrey
Copy link
Member

@asajeffrey asajeffrey commented May 12, 2017

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.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because renamings aren't externally visible

This change is Reviewable

@asajeffrey asajeffrey added the A-content/script Related to the script thread label May 12, 2017
@highfive
Copy link

Heads up! This PR modifies the following files:

  • @fitzgen: components/script/dom/bindings/codegen/CodegenRust.py, components/script/dom/htmliframeelement.rs, components/script/dom/document.rs, components/script/script_thread.rs, components/script/dom/browsingcontext.rs and 6 more
  • @KiChjang: components/script/dom/bindings/codegen/CodegenRust.py, components/script/dom/htmliframeelement.rs, components/script/dom/document.rs, components/script/script_thread.rs, components/script/dom/browsingcontext.rs and 6 more

@highfive
Copy link

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label May 12, 2017
@asajeffrey
Copy link
Member Author

cc @jdm @cbrewster

@@ -34,8 +34,7 @@ DOMInterfaces = {
},

'WindowProxy' : {
'nativeType': 'BrowsingContext',
'path': 'dom::browsingcontext::BrowsingContext',
'path': 'dom::windowproxy::WindowProxy',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably isn't needed any more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried removing it and got:

error[E0432]: unresolved import `dom::types::WindowProxy`
   --> /home/ajeffrey/github/asajeffrey/servo/target/debug/build/script-dcc60cde0df0c3a0/out/Bindings/DissimilarOriginWindowBinding.rs:339:5
    |
339 | use dom::types::WindowProxy;
    |     ^^^^^^^^^^^^^^^^^^^^^^^ no `WindowProxy` in `dom::types`

error[E0432]: unresolved import `dom::types::WindowProxy`
   --> /home/ajeffrey/github/asajeffrey/servo/target/debug/build/script-dcc60cde0df0c3a0/out/Bindings/HTMLIFrameElementBinding.rs:342:5
    |
342 | use dom::types::WindowProxy;
    |     ^^^^^^^^^^^^^^^^^^^^^^^ no `WindowProxy` in `dom::types`

error[E0432]: unresolved import `dom::types::WindowProxy`
   --> /home/ajeffrey/github/asajeffrey/servo/target/debug/build/script-dcc60cde0df0c3a0/out/Bindings/WindowBinding.rs:647:5
    |
647 | use dom::types::WindowProxy;
    |     ^^^^^^^^^^^^^^^^^^^^^^^ no `WindowProxy` in `dom::types`

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok!

@jdm
Copy link
Member

jdm commented May 12, 2017

Otherwise this looks good to me.

@jdm
Copy link
Member

jdm commented May 12, 2017

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit 43ca260 has been approved by jdm

@highfive highfive assigned jdm and unassigned KiChjang May 12, 2017
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 12, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 43ca260 with merge 34d0e59...

bors-servo pushed a commit that referenced this pull request May 13, 2017
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 -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: jdm
Pushing 34d0e59 to master...

@bors-servo bors-servo merged commit 43ca260 into servo:master May 13, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label May 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-content/script Related to the script thread
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants