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.

Sign up for GitHub

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

Jump to bottom

Move event state from Node to Element #7935

Merged
merged 3 commits into from
Oct 19, 2015
Merged

Move event state from Node to Element #7935

merged 3 commits into from
Oct 19, 2015

Conversation

bholley
Copy link
Contributor

@bholley bholley commented Oct 9, 2015

Just getting my feet wet with Rust here. Please feel free to nit the hell out of it stylistically and idiomatically. :-)

Review on Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Oct 9, 2015
@highfive
Copy link

highfive commented Oct 9, 2015

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify layout code, but no reftests are modified. Please consider adding a reftest!

@bholley bholley changed the title Eventstate element Move event state from Node to Element Oct 9, 2015
frewsxcv
frewsxcv reviewed Oct 9, 2015
View reviewed changes
components/script/dom/element.rs
@@ -20,7 +20,7 @@ use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding::HTMLTemplateEl
use dom::bindings::codegen::Bindings::NamedNodeMapBinding::NamedNodeMapMethods;
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
use dom::bindings::codegen::InheritTypes::{CharacterDataCast, DocumentDerived, ElementCast};
use dom::bindings::codegen::InheritTypes::{ElementDerived, EventTargetCast, HTMLAnchorElementCast};
use dom::bindings::codegen::InheritTypes::{ElementDerived, EventTargetCast, HTMLAnchorElementCast, HTMLFieldSetElementDerived, HTMLLegendElementDerived, HTMLOptGroupElementDerived};
Copy link
Contributor

Choose a reason for hiding this comment

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

https://travis-ci.org/servo/servo/jobs/84430060

The tidy check failed because these imports aren't sorted

Copy link
Contributor

Choose a reason for hiding this comment

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

All of the imports need to be sorted, so check out the next line and notice how those fall alphabetically before some of the imports on this line. Let me know if you need help

@frewsxcv frewsxcv added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Oct 9, 2015
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Oct 9, 2015
@Ms2ger
Copy link
Contributor

Ms2ger commented Oct 9, 2015

test-unit says:

Your changes have increased the stack size of commonly used DOM struct Element from 304 to 312.

@bors-servo
Copy link
Contributor

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

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Oct 9, 2015
@highfive highfive removed the S-needs-rebase There are merge conflict errors. label Oct 9, 2015
@bholley
Copy link
Contributor Author

bholley commented Oct 9, 2015

r? @jdm

@nox nox closed this Oct 10, 2015
@nox nox reopened this Oct 10, 2015
@bors-servo
Copy link
Contributor

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

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Oct 14, 2015
@bholley
Copy link
Contributor Author

bholley commented Oct 14, 2015

r? @nox

@highfive highfive assigned nox and unassigned jdm Oct 14, 2015
@nox nox removed the S-awaiting-review There is new code that needs to be reviewed. label Oct 15, 2015
@nox
Copy link
Contributor

nox commented Oct 15, 2015

@bors-servo r+

-S-awaiting-review

Reviewed 14 of 14 files at r1, 2 of 2 files at r2, 4 of 4 files at r3.
Review status: all files reviewed at latest revision, 1 unresolved discussion, some commit checks failed.

Comments from the review on Reviewable.io

@bors-servo
Copy link
Contributor

📌 Commit 0bef174 has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-needs-rebase There are merge conflict errors. labels Oct 15, 2015
@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Oct 16, 2015
@jdm
Copy link
Member

jdm commented Oct 16, 2015 

---- focus_selector.html == focus_selector_ref.html stdout ----
    thread 'focus_selector.html == focus_selector_ref.html' panicked at 'rendering difference: /tmp/servo-reftest-000065-diff.png',

That looks legit.

@bholley
Copy link
Contributor Author

bholley commented Oct 17, 2015

I didn't realize that Cell.get() returns a copy rather than a ref. Updating.

@bholley
Move Event States to |Element|.
75ec093 
Conceptually they belong there, rather than on |Node|.

Fixes servo#7934.
@bholley
Move what is now an |impl Element| block to element.rs.
ac8d57c 
This is a simple cut/paste.
@bholley
Bump the expected sizes for Element.
69255ed 
After rebasing, this suddenly became a problem again, even though there's no actual size increase here
(we're shrinking NodeFlags by 1 byte, and adding 1 byte of EventState). Moving the NodeFlags to the end
of Node and the EventState bits to the beginning of Element doesn't seem to helper either.

This is probably a padding issue that's worth investigating at some point, but given the level
of churn in this code it doesn't seem worth it to fuss to much over this right now.
@bholley
Copy link
Contributor Author

bholley commented Oct 17, 2015

Though I'm confused as to why this didn't surface before. Does CI only run when the PR Is actually about to be merged? if so, is there a tryserver-like way that I can get test results before that stage?

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Oct 17, 2015
@bholley
Copy link
Contributor Author

bholley commented Oct 17, 2015

r? @nox

@jdm
Copy link
Member

jdm commented Oct 17, 2015

You can get a reviewer to run @bors-servo try.

@nox
Copy link
Contributor

nox commented Oct 19, 2015

@bors-servo r+

Thanks for your contribution.

Reviewed 1 of 1 files at r6.
Review status: :shipit: all files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io

@bors-servo
Copy link
Contributor

📌 Commit 69255ed has been approved by nox

@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 Oct 19, 2015
@bors-servo
Copy link
Contributor

⌛ Testing commit 69255ed with merge 49f8cf9...

bors-servo pushed a commit that referenced this pull request Oct 19, 2015
Auto merge of #7935 - bholley:eventstate_element, r=nox
49f8cf9 
Move event state from Node to Element

Just getting my feet wet with Rust here. Please feel free to nit the hell out of it stylistically and idiomatically. :-)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7935)
<!-- Reviewable:end -->
@Ms2ger Ms2ger closed this Oct 19, 2015
@Ms2ger Ms2ger reopened this Oct 19, 2015
@bors-servo
Copy link
Contributor

⌛ Testing commit 69255ed with merge ff2151b...

bors-servo pushed a commit that referenced this pull request Oct 19, 2015
Auto merge of #7935 - bholley:eventstate_element, r=nox
ff2151b 
Move event state from Node to Element

Just getting my feet wet with Rust here. Please feel free to nit the hell out of it stylistically and idiomatically. :-)

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

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt

@bors-servo bors-servo merged commit 69255ed into servo:master Oct 19, 2015
This was referenced Oct 19, 2015
Merged
Merged
Merged
Merged
@bholley bholley deleted the eventstate_element branch October 30, 2016 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@bholley @highfive @Ms2ger @bors-servo @nox @frewsxcv @Manishearth @jdm