aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_plugins
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-03-08 04:28:58 -0800
committerGitHub <noreply@github.com>2017-03-08 04:28:58 -0800
commitf90fc2fa885fd63901c4a14ee70b0169c10efbd0 (patch)
treed033caf4ef57b4c4555efd3532fa2f8613d101d0 /components/script_plugins
parenta6c5a37a56cf2ec0d304f35164271b98e355ea79 (diff)
parentf79850754df974a9f58c235b0742d7e6b9f9559c (diff)
downloadservo-f90fc2fa885fd63901c4a14ee70b0169c10efbd0.tar.gz
servo-f90fc2fa885fd63901c4a14ee70b0169c10efbd0.zip
Auto merge of #15771 - jdm:img-panic, r=nox
Improve behaviour of image elements that perform multiple requests This addresses cases where image elements end up making multiple requests, as well as makes the element respond to additional relevant mutations that trigger updating the image data. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #15709 (github issue number if applicable). - [X] There are tests for these changes <!-- 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/15771) <!-- Reviewable:end -->
Diffstat (limited to 'components/script_plugins')
-rw-r--r--components/script_plugins/unrooted_must_root.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs
index ad74f6c4b8f..c62796b7a90 100644
--- a/components/script_plugins/unrooted_must_root.rs
+++ b/components/script_plugins/unrooted_must_root.rs
@@ -54,7 +54,8 @@ fn is_unrooted_ty(cx: &LateContext, ty: &ty::TyS, in_new_function: bool) -> bool
|| match_def_path(cx, did.did, &["core", "slice", "Iter"])
|| match_def_path(cx, did.did, &["std", "collections", "hash", "map", "Entry"])
|| match_def_path(cx, did.did, &["std", "collections", "hash", "map", "OccupiedEntry"])
- || match_def_path(cx, did.did, &["std", "collections", "hash", "map", "VacantEntry"]) {
+ || match_def_path(cx, did.did, &["std", "collections", "hash", "map", "VacantEntry"])
+ || match_def_path(cx, did.did, &["std", "collections", "hash", "set", "Iter"]) {
// Structures which are semantically similar to an &ptr.
false
} else if did.is_box() && in_new_function {