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

Fix Blob URL origin when scheme is file #12195

Merged
merged 1 commit into from Jul 3, 2016
Merged

Fix Blob URL origin when scheme is file #12195

merged 1 commit into from Jul 3, 2016
+14 −1

Conversation

@izgzhen
Copy link
Contributor

izgzhen commented Jul 3, 2016 •
edited

r? @Manishearth

Part of #11131

This change is Reviewable
@highfive
Copy link

highfive commented Jul 3, 2016

Heads up! This PR modifies the following files:
@highfive
Copy link

highfive commented Jul 3, 2016

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@izgzhen
Copy link
Contributor Author

izgzhen commented Jul 3, 2016

The interesting thing about this is that, WebKit will return things like blob:file:///c68fb2b6-ac47-4e55-80b2-650edaa39b77 while Chrome will return blob:null/c68fb2b6-ac47-4e55-80b2-650edaa39b77.

This is not well-specified on spec IIRC and I prefer the WebKit way.
@Manishearth
Copy link
Member

Manishearth commented Jul 3, 2016

Please mention the discrepancy between browsers in a comment, otherwise r=me 😄
@izgzhen izgzhen force-pushed the izgzhen:fix-url-blob branch from 3527f28 to 25d2698 Jul 3, 2016
components/script/dom/url.rs Outdated
/* NOTE(izgzhen): WebKit will return things like blob:file:///XXX
while Chrome will return blob:null/XXX
This is not well-specified, and I perfer the WebKit way here
*/

This comment has been minimized.

Sign in to view
@izgzhen

izgzhen Jul 3, 2016

Author Contributor

@Manishearth noted here

This comment has been minimized.

Sign in to view
@Manishearth

Manishearth Jul 3, 2016

Member

spelling!

@bors-servo delegate+

This comment has been minimized.

Sign in to view
@izgzhen

izgzhen Jul 3, 2016

Author Contributor

Oops....thanks
@Manishearth
Copy link
Member

Manishearth commented Jul 3, 2016

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

bors-servo commented Jul 3, 2016

✌️ @izgzhen can now approve this pull request
@izgzhen
Fix Blob URL origin when scheme is file
Loading status checks…
573610b
@izgzhen izgzhen force-pushed the izgzhen:fix-url-blob branch from 25d2698 to 573610b Jul 3, 2016
@izgzhen
Copy link
Contributor Author

izgzhen commented Jul 3, 2016

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jul 3, 2016

📌 Commit 573610b has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jul 3, 2016

⌛ Testing commit 573610b with merge b832f2b...
bors-servo added a commit that referenced this pull request Jul 3, 2016
@bors-servo
Auto merge of #12195 - izgzhen:fix-url-blob, r=Manishearth
Loading status checks…
b832f2b 
Fix Blob URL origin when scheme is file

<!-- Please describe your changes on the following line: -->

r? @Manishearth

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] These changes do not require tests because it needs future integration

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/12195)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 3, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows
@bors-servo bors-servo merged commit 573610b into servo:master Jul 3, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@izgzhen @highfive @Manishearth @bors-servo
You can’t perform that action at this time.