aboutsummaryrefslogtreecommitdiffstats
path: root/ports
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-05-21 05:28:58 -0500
committerGitHub <noreply@github.com>2017-05-21 05:28:58 -0500
commit3d40b516c8ac6e946cadace2378581cbac7b1e1b (patch)
treef279772930907e25c6f515074e4e398c765765e1 /ports
parent255387a915ef83db6b11d976f89c10b518c97487 (diff)
parente30e676658a869b345b2ce1ef1619b2f78f4824b (diff)
downloadservo-3d40b516c8ac6e946cadace2378581cbac7b1e1b.tar.gz
servo-3d40b516c8ac6e946cadace2378581cbac7b1e1b.zip
Auto merge of #16976 - upsuper:bug1366247, r=nox
Add sugar for already_AddRefed This is Servo side change of [bug 1366247](https://bugzilla.mozilla.org/show_bug.cgi?id=1366247). <!-- 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/16976) <!-- Reviewable:end -->
Diffstat (limited to 'ports')
-rw-r--r--ports/geckolib/glue.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs
index bc4db3e7204..55c031351c8 100644
--- a/ports/geckolib/glue.rs
+++ b/ports/geckolib/glue.rs
@@ -72,6 +72,7 @@ use style::gecko_bindings::structs::Loader;
use style::gecko_bindings::structs::RawGeckoPresContextOwned;
use style::gecko_bindings::structs::ServoElementSnapshotTable;
use style::gecko_bindings::structs::URLExtraData;
+use style::gecko_bindings::structs::already_AddRefed;
use style::gecko_bindings::structs::nsCSSValueSharedList;
use style::gecko_bindings::structs::nsCompatibility;
use style::gecko_bindings::structs::nsresult;
@@ -1005,9 +1006,10 @@ pub extern "C" fn Servo_KeyframesRule_GetName(rule: RawServoKeyframesRuleBorrowe
}
#[no_mangle]
-pub extern "C" fn Servo_KeyframesRule_SetName(rule: RawServoKeyframesRuleBorrowed, name: *mut nsIAtom) {
+pub extern "C" fn Servo_KeyframesRule_SetName(rule: RawServoKeyframesRuleBorrowed,
+ name: already_AddRefed<nsIAtom>) {
write_locked_arc(rule, |rule: &mut KeyframesRule| {
- rule.name = KeyframesName::Ident(CustomIdent(unsafe { Atom::from_addrefed(name) }));
+ rule.name = KeyframesName::Ident(CustomIdent(name.into()));
})
}