Skip to content

/ servo

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

Dispatch load events for cross origin iframes. Resolves #6672. #8558

Merged
merged 1 commit into from Nov 30, 2015
Merged

Dispatch load events for cross origin iframes. Resolves #6672. #8558

merged 1 commit into from Nov 30, 2015

Conversation

@jdm
Copy link
Member

jdm commented Nov 17, 2015

Splitting it out from #6677.

Review on Reviewable
@jdm
Copy link
Member Author

jdm commented Nov 17, 2015

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Nov 17, 2015

⌛ Trying commit 21eb3d3 with merge 061a9d6...
bors-servo added a commit that referenced this pull request Nov 17, 2015
@bors-servo
Auto merge of #8558 - jdm:crossoriginiframeload, r=<try>
061a9d6 
Dispatch load events for cross origin iframes. Resolves #6672.

Splitting it out from #6677.
@bors-servo
Copy link
Contributor

bors-servo commented Nov 17, 2015

💔 Test failed - mac-rel-wpt
@jdm jdm force-pushed the jdm:crossoriginiframeload branch from 21eb3d3 to c5e806f Nov 17, 2015
@jdm
Copy link
Member Author

jdm commented Nov 17, 2015

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Nov 17, 2015

⌛ Trying commit c5e806f with merge cdc3275...
bors-servo added a commit that referenced this pull request Nov 17, 2015
@bors-servo
Auto merge of #8558 - jdm:crossoriginiframeload, r=<try>
cdc3275 
Dispatch load events for cross origin iframes. Resolves #6672.

Splitting it out from #6677.

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

bors-servo commented Nov 17, 2015

💔 Test failed - linux-dev
@jdm jdm force-pushed the jdm:crossoriginiframeload branch from c5e806f to 89d5dbd Nov 17, 2015
@jdm
Copy link
Member Author

jdm commented Nov 17, 2015

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Nov 17, 2015

⌛ Trying commit 89d5dbd with merge 2781738...
bors-servo added a commit that referenced this pull request Nov 17, 2015
@bors-servo
Auto merge of #8558 - jdm:crossoriginiframeload, r=<try>
2781738 
Dispatch load events for cross origin iframes. Resolves #6672.

Splitting it out from #6677.

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

bors-servo commented Nov 17, 2015

💔 Test failed - linux-rel
@jdm jdm force-pushed the jdm:crossoriginiframeload branch from 89d5dbd to 723af30 Nov 17, 2015
@jdm
Copy link
Member Author

jdm commented Nov 17, 2015

Alright, this passes all tests on try.
r? @Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Nov 18, 2015

☔ The latest upstream changes (presumably #8569) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm jdm removed the S-awaiting-review label Nov 18, 2015
@jdm jdm force-pushed the jdm:crossoriginiframeload branch from 723af30 to 8b00c15 Nov 25, 2015
@jdm jdm removed the S-needs-rebase label Nov 25, 2015
@jdm
Copy link
Member Author

jdm commented Nov 25, 2015

Updated.
@glennw
Copy link
Member

glennw commented Nov 30, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 30, 2015

📌 Commit 8b00c15 has been approved by glennw
@bors-servo
Copy link
Contributor

bors-servo commented Nov 30, 2015

⌛ Testing commit 8b00c15 with merge 6aee242...
bors-servo added a commit that referenced this pull request Nov 30, 2015
@bors-servo
Auto merge of #8558 - jdm:crossoriginiframeload, r=glennw
6aee242 
Dispatch load events for cross origin iframes. Resolves #6672.

Splitting it out from #6677.

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

bors-servo commented Nov 30, 2015

💔 Test failed - linux-rel
@KiChjang
Copy link
Member

KiChjang commented Nov 30, 2015 

Ran 3717 tests finished in 200.0 seconds.
  • 3716 ran as expected. 711 tests skipped.
  • 1 tests had unexpected subtest results

Tests with unexpected results:
  ▶ Unexpected subtest result in /XMLHttpRequest/send-content-type-string.htm:
  │ FAIL [expected PASS] XMLHttpRequest: send() - Content-Type 1
  │   → assert_equals: expected "text/html;charset=UTF-8" but got "NO"
  │ FAIL [expected PASS] XMLHttpRequest: send() - Content-Type 2
  │   → assert_equals: expected "application/xml;charset=UTF-8" but got "NO"
  │ 
  │ request/<@http://web-platform.test:8000/XMLHttpRequest/send-content-type-string.htm:6:11
  │ Test.prototype.step@http://web-platform.test:8000/resources/testharness.js:1381:20
  │ test@http://web-platform.test:8000/resources/testharness.js:495:9
  │ request@http://web-platform.test:8000/XMLHttpRequest/send-content-type-string.htm:2:9
  │ init@http://web-platform.test:8000/XMLHttpRequest/send-content-type-string.htm:10:27
  └ load@http://web-platform.test:8000/XMLHttpRequest/send-content-type-string.htm:0:1
@jdm
Dispatch load events for cross origin iframes. Resolves #6672.
Loading status checks…
c23cbd4
@jdm
Copy link
Member Author

jdm commented Nov 30, 2015

The new failures are caused by us now running code in the test for the first time, since it's triggered by an onload event for a data: iframe. Marking as expected fail and relanding.
@jdm jdm force-pushed the jdm:crossoriginiframeload branch from 8b00c15 to c23cbd4 Nov 30, 2015
@jdm
Copy link
Member Author

jdm commented Nov 30, 2015

@bors-servo: r=glennw
@bors-servo
Copy link
Contributor

bors-servo commented Nov 30, 2015

📌 Commit c23cbd4 has been approved by glennw
@bors-servo
Copy link
Contributor

bors-servo commented Nov 30, 2015

⌛ Testing commit c23cbd4 with merge 51c19fd...
bors-servo added a commit that referenced this pull request Nov 30, 2015
@bors-servo
Auto merge of #8558 - jdm:crossoriginiframeload, r=glennw
Loading status checks…
51c19fd 
Dispatch load events for cross origin iframes. Resolves #6672.

Splitting it out from #6677.

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

bors-servo commented Nov 30, 2015

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit c23cbd4 into servo:master Nov 30, 2015
2 of 3 checks passed
2 of 3 checks passed
code-review/reviewable Review in progress: 16 of 23 files reviewed, 1 unresolved discussion
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@simartin simartin mentioned this pull request Dec 2, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@glennw glennw

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@jdm @bors-servo @glennw @KiChjang @Ms2ger @highfive
You can’t perform that action at this time.