Auto merge of #418 - jrmuizel:copy-attrs, r=jdm

bors-servo · web-flow · commit f4b01d234447 · 2020-10-21T13:01:21.000-04:00
Expose CTFontDescriptorCreateCopyWithAttributes
diff --git a/core-text/src/font_descriptor.rs b/core-text/src/font_descriptor.rs
@@ -278,6 +278,17 @@ impl CTFontDescriptor {
             CFDictionary::wrap_under_get_rule(value.as_CFTypeRef() as CFDictionaryRef)
         }
     }
+
+    pub fn create_copy_with_attributes(&self, attr: CFDictionary) -> Result<CTFontDescriptor, ()> {
+        unsafe {
+            let desc = CTFontDescriptorCreateCopyWithAttributes(self.as_concrete_TypeRef(),
+                                                                attr.as_concrete_TypeRef());
+            if desc.is_null() {
+                return Err(());
+            }
+            Ok(CTFontDescriptor::wrap_under_create_rule(desc))
+        }
+    }
 }
 
 pub fn new_from_attributes(attributes: &CFDictionary<CFString, CFType>) -> CTFontDescriptor {

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,17 @@ impl CTFontDescriptor {`
`278`	`278`	`CFDictionary::wrap_under_get_rule(value.as_CFTypeRef() as CFDictionaryRef)`
`279`	`279`	`}`
`280`	`280`	`}`
	`281`	`+`
	`282`	`+ pub fn create_copy_with_attributes(&self, attr: CFDictionary) -> Result<CTFontDescriptor, ()> {`
	`283`	`+ unsafe {`
	`284`	`+ let desc = CTFontDescriptorCreateCopyWithAttributes(self.as_concrete_TypeRef(),`
	`285`	`+ attr.as_concrete_TypeRef());`
	`286`	`+ if desc.is_null() {`
	`287`	`+ return Err(());`
	`288`	`+ }`
	`289`	`+ Ok(CTFontDescriptor::wrap_under_create_rule(desc))`
	`290`	`+ }`
	`291`	`+ }`
`281`	`292`	`}`
`282`	`293`
`283`	`294`	`pub fn new_from_attributes(attributes: &CFDictionary<CFString, CFType>) -> CTFontDescriptor {`