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

Implement Range#extractContents #6695

Merged
merged 1 commit into from Jul 28, 2015
Merged

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 22, 2015

Review on Reviewable

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jul 22, 2015

Critic review: https://critic.hoppipolla.co.uk/r/5623

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 22, 2015

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


Reviewed 3 of 3 files at r1.
Review status: all files reviewed at latest revision, 2 unresolved discussions, all commit checks successful.


components/script/dom/range.rs, line 502 [r1] (raw file):
Share some code around here.


components/script/dom/range.rs, line 569 [r1] (raw file):
Now I'm wondering whether the children of common_ancestor can change in steps 12-16.


Comments from the review on Reviewable.io

@Ms2ger Ms2ger self-assigned this Jul 22, 2015
@dzbarsky
Copy link
Member

dzbarsky commented Jul 23, 2015

Review status: all files reviewed at latest revision, 2 unresolved discussions, all commit checks successful.


components/script/dom/range.rs, line 502 [r1] (raw file):
Wasn't sure what you meant here, I shared this section with cloneContents. Which also fixed some test failures, any idea why?


components/script/dom/range.rs, line 569 [r1] (raw file):
Maybe? I also tried computing the children right before iterating them but it didn't change the test results.


Comments from the review on Reviewable.io

@dzbarsky
Copy link
Member

dzbarsky commented Jul 23, 2015

Review status: 1 of 3 files reviewed at latest revision, 2 unresolved discussions, all commit checks successful.


components/script/dom/range.rs, line 502 [r1] (raw file):
Nevermind, I'm pretty sure I fixed this earlier but forgot to update expectations.


Comments from the review on Reviewable.io

@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 28, 2015

-S-awaiting-review +S-needs-squash

lgtm


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


Comments from the review on Reviewable.io

@dzbarsky dzbarsky force-pushed the dzbarsky:extractcontents branch from 42630ad to 46bb09f Jul 28, 2015
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 28, 2015

@bors-servo r+ force

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2015

📌 Commit 46bb09f has been approved by Ms2ger

@Ms2ger Ms2ger closed this Jul 28, 2015
@Ms2ger Ms2ger reopened this Jul 28, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2015

Testing commit 46bb09f with merge e344374...

bors-servo pushed a commit that referenced this pull request Jul 28, 2015
Implement Range#extractContents



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

bors-servo commented Jul 28, 2015

💔 Test failed - linux2

@jdm
Copy link
Member

jdm commented Jul 28, 2015


/dom/interfaces.html
--------------------
PASS expected FAIL Range interface: operation extractContents()
PASS expected FAIL Range interface: document.createRange() must inherit property "extractContents" with the proper type (21)
PASS expected FAIL Range interface: detachedRange must inherit property "extractContents" with the proper type (21)
@dzbarsky dzbarsky force-pushed the dzbarsky:extractcontents branch from 46bb09f to 4f53bef Jul 28, 2015
@jdm
Copy link
Member

jdm commented Jul 28, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2015

📌 Commit 4f53bef has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2015

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

@dzbarsky dzbarsky force-pushed the dzbarsky:extractcontents branch from 4f53bef to f44691c Jul 28, 2015
@dzbarsky
Copy link
Member

dzbarsky commented Jul 28, 2015

@bors-servo: r=jdm

@jdm
Copy link
Member

jdm commented Jul 28, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2015

📌 Commit f44691c has been approved by jdm

@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 28, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2015

📌 Commit f44691c has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2015

Testing commit f44691c with merge bdf01dd...

bors-servo pushed a commit that referenced this pull request Jul 28, 2015
Implement Range#extractContents



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

bors-servo commented Jul 28, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3

@bors-servo bors-servo merged commit f44691c into servo:master Jul 28, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@dzbarsky dzbarsky deleted the dzbarsky:extractcontents branch Jul 29, 2015
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.

None yet

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