Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13370 - heycam:gecko-arc, r=Manishearth

Browse source 
Rename GeckoArc macro so it sounds like it's useful for already-threadsafely-refcounted objects.

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

This is just some renaming.  I will want to use this macro with some objects that support thread-safe refcounting, and which thus don't use `nsMainThreadPtrHolder`.  For fun I pushed a stylo try run with this change: https://treeherder.mozilla.org/#/jobs?repo=try&revision=4b6d906b423e

r? @Manishearth

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because _____

<!-- 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/13370)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-22 19:15:54 -05:00 • committed by GitHub
commit ee3f916b65
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ports/geckolib/gecko_bindings/ptr.rs
View file

@ -7,17 +7,20 @@ use heapsize::HeapSizeOf;
use std::fmt::{self, Debug}; use std::fmt::{self, Debug};
// Defines an Arc-like type that manages a refcounted Gecko object stored // Defines an Arc-like type that manages a refcounted Gecko object stored
// in a ThreadSafeFooHolder smart pointer. Used in tandem with the // in a ThreadSafeFooHolder smart pointer (for those Gecko classes that
// NS_DECL_HOLDER_FFI_REFCOUNTING-defined types and functions in Gecko. // do not have thread-safe refcounting support) or as raw pointers (for
macro_rules! define_holder_arc { // those that do have thread-safe refcounting support). Used in tandem
($arc_type:ident, $name:ident, $holder_type:ident, $addref: ident, $release: ident) => ( // with the NS_DECL_(HOLDER|THREADSAFE)_FFI_REFCOUNTING-defined types and
// functions in Gecko.
macro_rules! define_arc {
($arc_type:ident, $name:ident, $gecko_type:ident, $addref: ident, $release: ident) => (
#[derive(PartialEq)] #[derive(PartialEq)]
pub struct $arc_type { pub struct $arc_type {
ptr: *mut $holder_type, ptr: *mut $gecko_type,
} }
impl $arc_type { impl $arc_type {
pub fn new(data: *mut $holder_type) -> $arc_type { pub fn new(data: *mut $gecko_type) -> $arc_type {
debug_assert!(!data.is_null()); debug_assert!(!data.is_null());
unsafe { $addref(data); } unsafe { $addref(data); }
$arc_type { $arc_type {
@ -25,7 +28,7 @@ macro_rules! define_holder_arc {
} }
} }
pub fn as_raw(&self) -> *mut $holder_type { self.ptr } pub fn as_raw(&self) -> *mut $gecko_type { self.ptr }
} }
unsafe impl Send for $arc_type {} unsafe impl Send for $arc_type {}
@ -55,7 +58,7 @@ macro_rules! define_holder_arc {
) )
} }
define_holder_arc!(GeckoArcPrincipal, Principal, ThreadSafePrincipalHolder, define_arc!(GeckoArcPrincipal, Principal, ThreadSafePrincipalHolder,
Gecko_AddRefPrincipalArbitraryThread, Gecko_ReleasePrincipalArbitraryThread); Gecko_AddRefPrincipalArbitraryThread, Gecko_ReleasePrincipalArbitraryThread);
define_holder_arc!(GeckoArcURI, URI, ThreadSafeURIHolder, define_arc!(GeckoArcURI, URI, ThreadSafeURIHolder,
Gecko_AddRefURIArbitraryThread, Gecko_ReleaseURIArbitraryThread); Gecko_AddRefURIArbitraryThread, Gecko_ReleaseURIArbitraryThread);