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

Disable scripting for documents created without a browsing context #10946

Merged
merged 2 commits into from May 2, 2016
Merged

Disable scripting for documents created without a browsing context #10946

merged 2 commits into from May 2, 2016

Conversation

@bd339
Copy link
Contributor

bd339 commented Apr 30, 2016 •
edited by larsbergstrom

Goes towards closing #10940.

This change is Reviewable
@highfive
Copy link

highfive commented Apr 30, 2016

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @SimonSapin (or someone else) soon.
@highfive
Copy link

highfive commented Apr 30, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/document.rs
@highfive
Copy link

highfive commented Apr 30, 2016

warning Warning warning

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

bors-servo commented May 1, 2016

☔ The latest upstream changes (presumably #10913) made this pull request unmergeable. Please resolve the merge conflicts.
bd339 added 2 commits Apr 30, 2016
bd339
make `scripting_enabled` depend on a browsing context
0c92e19
bd339
test that JS on a document without a browsing context isn't executed.
Loading status checks…
2ecd57c
@nox nox assigned nox and unassigned SimonSapin May 2, 2016
@nox
Copy link
Member

nox commented May 2, 2016

What a horrible bug. :) Thanks for your contribution!

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

bors-servo commented May 2, 2016

📌 Commit 2ecd57c has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented May 2, 2016

⌛ Testing commit 2ecd57c with merge a54deda...
bors-servo added a commit that referenced this pull request May 2, 2016
@bors-servo
Auto merge of #10946 - bd339:iss10940, r=nox
Loading status checks…
a54deda 
Disable scripting for documents created without a browsing context

Goes towards closing #10940.

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

bors-servo commented May 2, 2016

💔 Test failed - windows
@jdm
Copy link
Member

jdm commented May 2, 2016

@bors-servo: retry

  • git
@bors-servo
Copy link
Contributor

bors-servo commented May 2, 2016

⚡ Previous build results for android, arm32, arm64, linux-dev, mac-dev-unit are reusable. Rebuilding only linux-rel, mac-rel-css, mac-rel-wpt, windows...
@bors-servo
Copy link
Contributor

bors-servo commented May 2, 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 2ecd57c into servo:master May 2, 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
@bors-servo bors-servo mentioned this pull request May 2, 2016
Merged
@KiChjang KiChjang mentioned this pull request May 3, 2016
Closed
@bd339 bd339 deleted the bd339:iss10940 branch May 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@bd339 @highfive @bors-servo @nox @jdm @SimonSapin
You can’t perform that action at this time.