Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13784 - TooManyBees:13363-check-script-enabled, r=Ms2ger

Browse source 
Issue 13363 - Step 1.2 of compiling event handler

<!-- Please describe your changes on the following line: -->
Adds the conditional to test that scripting is enabled in `EventTarget#get_compiled_event_handler`, and return `None` early if not.

Adds tests for "scripting enabled" and "scripting disabled" cases.

---
<!-- 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
- [x] These changes fix #13363 (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes

<!-- 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="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13784)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-21 09:24:05 -05:00 • committed by GitHub
commit 776a1d9cac
3 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/eventtarget.rs
View file

@ -373,7 +373,10 @@ impl EventTarget {
None => self.downcast::<Window>().unwrap().Document(),
};
// TODO step 1.2 (browsing context/scripting enabled)
// Step 1.2
if !document.is_scripting_enabled() {
return None;
}
// Step 1.3
let body: Vec<u16> = handler.source.encode_utf16().collect();

6
tests/wpt/metadata/MANIFEST.json
View file

@ -37762,6 +37762,12 @@
"path": "html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html",
"url": "/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html"
}
],
"html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html": [
{
"path": "html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html",
"url": "/html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html"
}
]
}
},

21
tests/wpt/web-platform-tests/html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html Normal file
View file

@ -0,0 +1,21 @@
<!doctype html>
<meta charset="utf-8">
<title>Uncompiled event handler check that scripting is enabled</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
setup({ allow_uncaught_exception: true });
test(function() {
var invoked = false;
window.addEventListener("error", function() {
invoked = true;
});
// Make sure that `this_will_error` will in fact error when it's referenced
assert_equals(typeof this_will_error, "undefined");
var dom = (new DOMParser()).parseFromString("<div id=\"has-event-handler\" onclick=\"this_will_error;\"></div>", "text/html");
var click = new MouseEvent("click");
dom.getElementById("has-event-handler").dispatchEvent(click);
assert_equals(invoked, false);
}, "when scripting is disabled, the handler is never compiled");
</script>