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

Move `MozBrowserEvent` to `script_traits` #9271

Merged
merged 1 commit into from Jan 13, 2016

Conversation

@apopiak
Copy link
Contributor

apopiak commented Jan 12, 2016

close #9225

Review on Reviewable

@highfive
Copy link

highfive commented Jan 12, 2016

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @Ms2ger (or someone else) soon.

@apopiak
Copy link
Contributor Author

apopiak commented Jan 12, 2016

sry, overlooked the WIP and the rebase

@apopiak apopiak force-pushed the apopiak:moveMozBrowserEvent_9225 branch from 94f4faa to 06911b6 Jan 12, 2016
@KiChjang
Copy link
Member

KiChjang commented Jan 12, 2016

-S-awaiting-review +S-needs-code-changes

Thanks for taking up the issue! A couple of minor nits and this can be merged :)


Reviewed 10 of 10 files at r1.
Review status: all files reviewed at latest revision, 9 unresolved discussions.


components/compositing/constellation.rs, line 33 [r1] (raw file):
nit: Remove the braces and meld into next/previous line.


components/compositing/constellation.rs, line 49 [r1] (raw file):
nit: Meld into next line.


components/compositing/pipeline.rs, line 28 [r1] (raw file):
nit: Meld into previous line.


components/script/dom/htmliframeelement.rs, line 29 [r1] (raw file):
nit: Meld into next line.


components/script/dom/htmliframeelement.rs, line 34 [r1] (raw file):
nit: Combine IFrameLoadInfo, MozBrowserEvent and ScriptMsg as ConstellationMsg into one line.


components/script/dom/htmllinkelement.rs, line 27 [r1] (raw file):
nit: Remove the braces.


components/script/dom/htmllinkelement.rs, line 30 [r1] (raw file):
nit: Meld into next line.


components/script/dom/window.rs, line 60 [r1] (raw file):
nit: Meld into next line.


components/script/script_thread.rs, line 86 [r1] (raw file):
nit: Meld into next/previous line.


Comments from the review on Reviewable.io

@KiChjang KiChjang self-assigned this Jan 12, 2016
@apopiak apopiak force-pushed the apopiak:moveMozBrowserEvent_9225 branch from 06911b6 to 0fb0615 Jan 12, 2016
@KiChjang
Copy link
Member

KiChjang commented Jan 12, 2016

-S-awaiting-review

All good! Thanks for taking the time to work on this!

@bors-servo r+


Reviewed 7 of 7 files at r2.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from the review on Reviewable.io

@bors-servo
Copy link
Contributor

bors-servo commented Jan 12, 2016

📌 Commit 0fb0615 has been approved by KiChjang

@bors-servo
Copy link
Contributor

bors-servo commented Jan 12, 2016

Testing commit 0fb0615 with merge 8590779...

bors-servo added a commit that referenced this pull request Jan 12, 2016
Move `MozBrowserEvent` to `script_traits`

close #9225

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9271)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 12, 2016

💔 Test failed - mac-rel-wpt

@nox
Copy link
Member

nox commented Jan 12, 2016

@bors-servo retry

Git snafu.

@bors-servo
Copy link
Contributor

bors-servo commented Jan 12, 2016

🔒 Merge conflict

@bors-servo
Copy link
Contributor

bors-servo commented Jan 12, 2016

The latest upstream changes (presumably #9279) made this pull request unmergeable. Please resolve the merge conflicts.

@apopiak apopiak force-pushed the apopiak:moveMozBrowserEvent_9225 branch from 0fb0615 to 79e69c9 Jan 13, 2016
@apopiak
Copy link
Contributor Author

apopiak commented Jan 13, 2016

rebased

@KiChjang
Copy link
Member

KiChjang commented Jan 13, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jan 13, 2016

📌 Commit 79e69c9 has been approved by KiChjang

@apopiak apopiak force-pushed the apopiak:moveMozBrowserEvent_9225 branch from 79e69c9 to 4b773ce Jan 13, 2016
@apopiak
Copy link
Contributor Author

apopiak commented Jan 13, 2016

@KiChjang and another commit --amend because the rebase wasn't clean (I left a doubling of DocumentState in)

@KiChjang
Copy link
Member

KiChjang commented Jan 13, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jan 13, 2016

📌 Commit 4b773ce has been approved by KiChjang

@bors-servo
Copy link
Contributor

bors-servo commented Jan 13, 2016

Testing commit 4b773ce with merge 897007f...

bors-servo added a commit that referenced this pull request Jan 13, 2016
Move `MozBrowserEvent` to `script_traits`

close #9225

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9271)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 13, 2016

@bors-servo bors-servo merged commit 4b773ce into servo:master Jan 13, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@apopiak apopiak deleted the apopiak:moveMozBrowserEvent_9225 branch Jan 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

5 participants
You can’t perform that action at this time.