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

Use the document base url when resolving iframe URLs #10626

Merged
merged 1 commit into from Apr 15, 2016
Merged

Conversation

@ziyunli
Copy link
Contributor

ziyunli commented Apr 15, 2016

Fixes #10576.

This change is Reviewable

@highfive
Copy link

highfive commented Apr 15, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/htmliframeelement.rs
let window = window_from_node(self);
window.get_url().join(&url).ok()
let document = document_from_node(self);
document.base_url().join(&url).ok()

This comment has been minimized.

@KiChjang

KiChjang Apr 15, 2016

Member

Looks like no other code is referencing document at all, can you make this a one-liner instead?

This comment has been minimized.

@ziyunli

ziyunli Apr 15, 2016

Author Contributor

sounds good, I will update this PR shortly

@ziyunli ziyunli force-pushed the ziyunli:10576 branch from 626000b to 52c6fd5 Apr 15, 2016
@KiChjang
Copy link
Member

KiChjang commented Apr 15, 2016

@bors-servo r+

Thanks!

@bors-servo
Copy link
Contributor

bors-servo commented Apr 15, 2016

📌 Commit 52c6fd5 has been approved by KiChjang

@bors-servo
Copy link
Contributor

bors-servo commented Apr 15, 2016

Testing commit 52c6fd5 with merge 7faa3ed...

bors-servo added a commit that referenced this pull request Apr 15, 2016
Use the document base url when resolving iframe URLs

Fixes #10576.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10626)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 15, 2016

💔 Test failed - linux-rel

@KiChjang
Copy link
Member

KiChjang commented Apr 15, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 15, 2016

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

@bors-servo bors-servo mentioned this pull request Apr 15, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Apr 15, 2016

@bors-servo bors-servo merged commit 52c6fd5 into servo:master Apr 15, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@ziyunli ziyunli deleted the ziyunli:10576 branch Apr 16, 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

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