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

Make iframes block the enclosing document's load event #6677

Merged
merged 8 commits into from Feb 10, 2016

Conversation

@jdm
Copy link
Member

jdm commented Jul 20, 2015

It occurs to me as I write this that this doesn't handle the case of removing the iframe from the document before it's finished loading. Consider this an early feedback release!

Review on Reviewable

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jul 20, 2015

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

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.

@jdm jdm force-pushed the jdm:iframeblockonload branch from 7bdd88a to f812e7f Jul 20, 2015
@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 20, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2015

📌 Commit f812e7f has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2015

Testing commit f812e7f with merge 0fdb2aa...

bors-servo pushed a commit that referenced this pull request Jul 20, 2015
Make iframes block the enclosing document's load event

It occurs to me as I write this that this doesn't handle the case of removing the iframe from the document before it's finished loading. Consider this an early feedback release!

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

bors-servo commented Jul 20, 2015

💔 Test failed - mac2

@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 21, 2015

failures:
    iframe/hide_layers1.html == iframe/hide_layers_ref.html
@bors-servo
Copy link
Contributor

bors-servo commented Jul 22, 2015

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

@jdm
Copy link
Member Author

jdm commented Jul 29, 2015

Interestingly, the test fails because while the iframe borders disappear, the iframe content remains. This is unaffected by the presence of -i.

@glennw
Copy link
Member

glennw commented Jul 29, 2015

@jdm This means that the owning document has correctly hidden the iframe node, but that the compositor is still drawing the iframe layer, if that's of any help.

@metajack
Copy link
Contributor

metajack commented Sep 1, 2015

r? @Ms2ger

@jdm
Copy link
Member Author

jdm commented Sep 1, 2015

I think I'd like to finish the missing bits of unblocking the page if the iframe is removed before merging this again.

@Ms2ger Ms2ger assigned jdm and unassigned Ms2ger Sep 2, 2015
@jdm jdm assigned Ms2ger and unassigned jdm Sep 2, 2015
@jdm jdm force-pushed the jdm:iframeblockonload branch from 7f0b485 to 83a1078 Sep 3, 2015
@jdm
Copy link
Member Author

jdm commented Feb 10, 2016

With regards to the fn url that isn't used, it's convenient for debugging so I'd rather not remove it.

@jdm
Copy link
Member Author

jdm commented Feb 10, 2016

Filed #9592 and #9560.

@jdm jdm force-pushed the jdm:iframeblockonload branch 2 times, most recently from c43eccc to b46b91b Feb 10, 2016
@jdm jdm removed the S-needs-rebase label Feb 10, 2016
@jdm
Copy link
Member Author

jdm commented Feb 10, 2016

With regards to the test, we only get two load events.

@jdm jdm force-pushed the jdm:iframeblockonload branch from b46b91b to dda9e2e Feb 10, 2016
@jdm jdm force-pushed the jdm:iframeblockonload branch from dda9e2e to c5fe8f7 Feb 10, 2016
@jdm
Copy link
Member Author

jdm commented Feb 10, 2016

@bors-servo: r=Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Feb 10, 2016

📌 Commit c5fe8f7 has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Feb 10, 2016

Testing commit c5fe8f7 with merge a31f31e...

bors-servo added a commit that referenced this pull request Feb 10, 2016
Make iframes block the enclosing document's load event

It occurs to me as I write this that this doesn't handle the case of removing the iframe from the document before it's finished loading. Consider this an early feedback release!

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

bors-servo commented Feb 10, 2016

💔 Test failed - mac-dev-unit

@jdm
Copy link
Member Author

jdm commented Feb 10, 2016

@bors-servo: retry

  • git issue
@bors-servo
Copy link
Contributor

bors-servo commented Feb 10, 2016

Previous build results for android, gonk, linux-dev, linux-rel, mac-rel-css, mac-rel-wpt are reusable. Rebuilding only mac-dev-unit...

@bors-servo
Copy link
Contributor

bors-servo commented Feb 10, 2016

@bors-servo bors-servo merged commit c5fe8f7 into servo:master Feb 10, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Ms2ger Ms2ger deleted the jdm:iframeblockonload branch Mar 9, 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.

None yet

You can’t perform that action at this time.