Auto merge of #14608 - upsuper:bug1323147, r=heycam

Use string and nsCSSProperty for stylo CSSOM FFI

<!-- Please describe your changes on the following line: -->
This is the Servo side change of [bug 1323147](https://bugzilla.mozilla.org/show_bug.cgi?id=1323147) which has been reviewed by @heycam and @SimonSapin on Bugzilla.

r? @heycam

<!-- 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/14608)
<!-- Reviewable:end -->

components/style/binding_tools/regen_atoms.py

@@ -33,14 +33,14 @@ def msvc32_symbolify(source, ident):
 
 
 class GkAtomSource:
-    PATTERN = re.compile('^GK_ATOM\((?P<ident>.+),\s*"(?P<value>.*)"\)', re.M)
+    PATTERN = re.compile('^GK_ATOM\((.+),\s*"(.*)"\)')
     FILE = "include/nsGkAtomList.h"
     CLASS = "nsGkAtoms"
     TYPE = "nsIAtom"
 
 
 class CSSPseudoElementsAtomSource:
-    PATTERN = re.compile('^CSS_PSEUDO_ELEMENT\((?P<ident>.+),\s*"(?P<value>.*)",', re.M)
+    PATTERN = re.compile('^CSS_PSEUDO_ELEMENT\((.+),\s*"(.*)",')
     FILE = "include/nsCSSPseudoElementList.h"
     CLASS = "nsCSSPseudoElements"
     # NB: nsICSSPseudoElement is effectively the same as a nsIAtom, but we need
@@ -49,24 +49,16 @@ class CSSPseudoElementsAtomSource:
 
 
 class CSSAnonBoxesAtomSource:
-    PATTERN = re.compile('^CSS_ANON_BOX\((?P<ident>.+),\s*"(?P<value>.*)"\)', re.M)
+    PATTERN = re.compile('^CSS_ANON_BOX\((.+),\s*"(.*)"\)')
     FILE = "include/nsCSSAnonBoxList.h"
     CLASS = "nsCSSAnonBoxes"
     TYPE = "nsICSSAnonBoxPseudo"
 
 
-class CSSPropsAtomSource:
-    PATTERN = re.compile('^CSS_PROP_[A-Z]+\(\s*(?P<value>[^,]+),\s*(?P<ident>[^,]+)', re.M)
-    FILE = "include/nsCSSPropList.h"
-    CLASS = "nsCSSProps"
-    TYPE = "nsICSSProperty"
-
-
 SOURCES = [
     GkAtomSource,
     CSSPseudoElementsAtomSource,
     CSSAnonBoxesAtomSource,
-    CSSPropsAtomSource,
 ]
 
 
@@ -104,14 +96,10 @@ def collect_atoms(objdir):
     atoms = []
     for source in SOURCES:
         with open(os.path.join(objdir, source.FILE)) as f:
-            content = f.read()
+            for line in f.readlines():
-        found = set()
+                result = re.match(source.PATTERN, line)
-        for match in source.PATTERN.finditer(content):
+                if result:
-            ident = match.group('ident')
+                    atoms.append(Atom(source, result.group(1), result.group(2)))
-            if ident in found:
-                continue
-            found.add(ident)
-            atoms.append(Atom(source, ident, match.group('value')))
     return atoms
 
 

components/style/build_gecko.rs

@@ -460,6 +460,7 @@ mod bindings {
             "StyleBasicShapeType",
             "StyleClipPath",
             "nsCSSKeyword",
+            "nsCSSPropertyID",
             "nsCSSShadowArray",
             "nsCSSValue",
             "nsCSSValueSharedList",

components/style/gecko_bindings/bindings.rs

@@ -19,6 +19,7 @@ use gecko_bindings::structs::StyleBasicShape;
 use gecko_bindings::structs::StyleBasicShapeType;
 use gecko_bindings::structs::StyleClipPath;
 use gecko_bindings::structs::nsCSSKeyword;
+use gecko_bindings::structs::nsCSSPropertyID;
 use gecko_bindings::structs::nsCSSShadowArray;
 use gecko_bindings::structs::nsCSSValue;
 use gecko_bindings::structs::nsCSSValueSharedList;
@@ -1092,8 +1093,7 @@ extern "C" {
 extern "C" {
     pub fn Servo_DeclarationBlock_SerializeOneValue(declarations:
                                                         RawServoDeclarationBlockBorrowed,
-                                                    property: *mut nsIAtom,
+                                                    property: nsCSSPropertyID,
-                                                    is_custom: bool,
                                                     buffer:
                                                         *mut nsAString_internal);
 }
@@ -1113,8 +1113,16 @@ extern "C" {
 extern "C" {
     pub fn Servo_DeclarationBlock_GetPropertyValue(declarations:
                                                        RawServoDeclarationBlockBorrowed,
-                                                   property: *mut nsIAtom,
+                                                   property:
-                                                   is_custom: bool,
+                                                       *const nsACString_internal,
+                                                   value:
+                                                       *mut nsAString_internal);
+}
+extern "C" {
+    pub fn Servo_DeclarationBlock_GetPropertyValueById(declarations:
+                                                           RawServoDeclarationBlockBorrowed,
+                                                       property:
+                                                           nsCSSPropertyID,
                                                        value:
                                                            *mut nsAString_internal);
 }
@@ -1122,23 +1130,36 @@ extern "C" {
     pub fn Servo_DeclarationBlock_GetPropertyIsImportant(declarations:
                                                              RawServoDeclarationBlockBorrowed,
                                                          property:
-                                                             *mut nsIAtom,
+                                                             *const nsACString_internal)
-                                                         is_custom: bool)
      -> bool;
 }
 extern "C" {
     pub fn Servo_DeclarationBlock_SetProperty(declarations:
                                                   RawServoDeclarationBlockBorrowed,
-                                              property: *mut nsIAtom,
+                                              property:
-                                              is_custom: bool,
+                                                  *const nsACString_internal,
                                               value: *mut nsACString_internal,
                                               is_important: bool) -> bool;
 }
+extern "C" {
+    pub fn Servo_DeclarationBlock_SetPropertyById(declarations:
+                                                      RawServoDeclarationBlockBorrowed,
+                                                  property: nsCSSPropertyID,
+                                                  value:
+                                                      *mut nsACString_internal,
+                                                  is_important: bool) -> bool;
+}
 extern "C" {
     pub fn Servo_DeclarationBlock_RemoveProperty(declarations:
                                                      RawServoDeclarationBlockBorrowed,
-                                                 property: *mut nsIAtom,
+                                                 property:
-                                                 is_custom: bool);
+                                                     *const nsACString_internal);
+}
+extern "C" {
+    pub fn Servo_DeclarationBlock_RemovePropertyById(declarations:
+                                                         RawServoDeclarationBlockBorrowed,
+                                                     property:
+                                                         nsCSSPropertyID);
 }
 extern "C" {
     pub fn Servo_CSSSupports(name: *const nsACString_internal,

ports/geckolib/glue.rs

@@ -10,6 +10,7 @@ use euclid::Size2D;
 use parking_lot::RwLock;
 use selectors::Element;
 use servo_url::ServoUrl;
+use std::borrow::Cow;
 use std::fmt::Write;
 use std::mem::transmute;
 use std::ptr;
@@ -38,7 +39,7 @@ use style::gecko_bindings::bindings::RawGeckoElementBorrowed;
 use style::gecko_bindings::bindings::ServoComputedValuesBorrowedOrNull;
 use style::gecko_bindings::bindings::nsTArrayBorrowed_uintptr_t;
 use style::gecko_bindings::structs;
-use style::gecko_bindings::structs::{SheetParsingMode, nsIAtom};
+use style::gecko_bindings::structs::{SheetParsingMode, nsIAtom, nsCSSPropertyID};
 use style::gecko_bindings::structs::{ThreadSafePrincipalHolder, ThreadSafeURIHolder};
 use style::gecko_bindings::structs::{nsRestyleHint, nsChangeHint};
 use style::gecko_bindings::structs::nsresult;
@@ -619,16 +620,24 @@ pub extern "C" fn Servo_DeclarationBlock_GetCssText(declarations: RawServoDeclar
     declarations.read().to_css(unsafe { result.as_mut().unwrap() }).unwrap();
 }
 
+macro_rules! get_property_id_from_nscsspropertyid {
+    ($property_id: ident, $ret: expr) => {{
+        match PropertyId::from_nscsspropertyid($property_id) {
+            Ok(property_id) => property_id,
+            Err(()) => { return $ret; }
+        }
+    }}
+}
+
 #[no_mangle]
 pub extern "C" fn Servo_DeclarationBlock_SerializeOneValue(
     declarations: RawServoDeclarationBlockBorrowed,
-    property: *mut nsIAtom, is_custom: bool,
+    property_id: nsCSSPropertyID, buffer: *mut nsAString)
-    buffer: *mut nsAString)
 {
+    let property_id = get_property_id_from_nscsspropertyid!(property_id, ());
     let declarations = RwLock::<PropertyDeclarationBlock>::as_arc(&declarations);
-    let property = get_property_id_from_atom(property, is_custom);
     let mut string = String::new();
-    let rv = declarations.read().single_value_to_css(&property, &mut string);
+    let rv = declarations.read().single_value_to_css(&property_id, &mut string);
     debug_assert!(rv.is_ok());
 
     write!(unsafe { &mut *buffer }, "{}", string).expect("Failed to copy string");
@@ -653,44 +662,49 @@ pub extern "C" fn Servo_DeclarationBlock_GetNthProperty(declarations: RawServoDe
     }
 }
 
-fn get_property_id_from_atom(atom: *mut nsIAtom, is_custom: bool) -> PropertyId {
+macro_rules! get_property_id_from_property {
-    let atom = Atom::from(atom);
+    ($property: ident, $ret: expr) => {{
-    if !is_custom {
+        let property = unsafe { $property.as_ref().unwrap().as_str_unchecked() };
-        // FIXME: can we do this mapping without going through a UTF-8 string?
+        match PropertyId::parse(Cow::Borrowed(property)) {
-        // Maybe even from nsCSSPropertyID directly?
+            Ok(property_id) => property_id,
-        PropertyId::parse(atom.to_string().into()).expect("got unknown property name from Gecko")
+            Err(()) => { return $ret; }
-    } else {
-        PropertyId::Custom(atom)
         }
+    }}
+}
+
+fn get_property_value(declarations: RawServoDeclarationBlockBorrowed,
+                      property_id: PropertyId, value: *mut nsAString) {
+    let declarations = RwLock::<PropertyDeclarationBlock>::as_arc(&declarations);
+    declarations.read().property_value_to_css(&property_id, unsafe { value.as_mut().unwrap() }).unwrap();
 }
 
 #[no_mangle]
 pub extern "C" fn Servo_DeclarationBlock_GetPropertyValue(declarations: RawServoDeclarationBlockBorrowed,
-                                                          property: *mut nsIAtom, is_custom: bool,
+                                                          property: *const nsACString, value: *mut nsAString) {
-                                                          value: *mut nsAString) {
+    get_property_value(declarations, get_property_id_from_property!(property, ()), value)
-    let declarations = RwLock::<PropertyDeclarationBlock>::as_arc(&declarations);
+}
-    let property = get_property_id_from_atom(property, is_custom);
+
-    declarations.read().property_value_to_css(&property, unsafe { value.as_mut().unwrap() }).unwrap();
+#[no_mangle]
+pub extern "C" fn Servo_DeclarationBlock_GetPropertyValueById(declarations: RawServoDeclarationBlockBorrowed,
+                                                              property: nsCSSPropertyID, value: *mut nsAString) {
+    get_property_value(declarations, get_property_id_from_nscsspropertyid!(property, ()), value)
 }
 
 #[no_mangle]
 pub extern "C" fn Servo_DeclarationBlock_GetPropertyIsImportant(declarations: RawServoDeclarationBlockBorrowed,
-                                                                property: *mut nsIAtom, is_custom: bool) -> bool {
+                                                                property: *const nsACString) -> bool {
+    let property_id = get_property_id_from_property!(property, false);
     let declarations = RwLock::<PropertyDeclarationBlock>::as_arc(&declarations);
-    let property = get_property_id_from_atom(property, is_custom);
+    declarations.read().property_priority(&property_id).important()
-    declarations.read().property_priority(&property).important()
 }
 
-#[no_mangle]
+fn set_property(declarations: RawServoDeclarationBlockBorrowed, property_id: PropertyId,
-pub extern "C" fn Servo_DeclarationBlock_SetProperty(declarations: RawServoDeclarationBlockBorrowed,
-                                                     property: *mut nsIAtom, is_custom: bool,
                 value: *mut nsACString, is_important: bool) -> bool {
-    let property = get_property_id_from_atom(property, is_custom);
     let value = unsafe { value.as_ref().unwrap().as_str_unchecked() };
     // FIXME Needs real URL and ParserContextExtraData.
     let base_url = &*DUMMY_BASE_URL;
     let extra_data = ParserContextExtraData::default();
-    if let Ok(decls) = parse_one_declaration(property, value, &base_url,
+    if let Ok(decls) = parse_one_declaration(property_id, value, &base_url,
                                              Box::new(StdoutErrorReporter), extra_data) {
         let mut declarations = RwLock::<PropertyDeclarationBlock>::as_arc(&declarations).write();
         let importance = if is_important { Importance::Important } else { Importance::Normal };
@@ -704,11 +718,34 @@ pub extern "C" fn Servo_DeclarationBlock_SetProperty(declarations: RawServoDecla
 }
 
 #[no_mangle]
-pub extern "C" fn Servo_DeclarationBlock_RemoveProperty(declarations: RawServoDeclarationBlockBorrowed,
+pub extern "C" fn Servo_DeclarationBlock_SetProperty(declarations: RawServoDeclarationBlockBorrowed,
-                                                        property: *mut nsIAtom, is_custom: bool) {
+                                                     property: *const nsACString, value: *mut nsACString,
+                                                     is_important: bool) -> bool {
+    set_property(declarations, get_property_id_from_property!(property, false), value, is_important)
+}
+
+#[no_mangle]
+pub extern "C" fn Servo_DeclarationBlock_SetPropertyById(declarations: RawServoDeclarationBlockBorrowed,
+                                                         property: nsCSSPropertyID, value: *mut nsACString,
+                                                         is_important: bool) -> bool {
+    set_property(declarations, get_property_id_from_nscsspropertyid!(property, false), value, is_important)
+}
+
+fn remove_property(declarations: RawServoDeclarationBlockBorrowed, property_id: PropertyId) {
     let declarations = RwLock::<PropertyDeclarationBlock>::as_arc(&declarations);
-    let property = get_property_id_from_atom(property, is_custom);
+    declarations.write().remove_property(&property_id);
-    declarations.write().remove_property(&property);
+}
+
+#[no_mangle]
+pub extern "C" fn Servo_DeclarationBlock_RemoveProperty(declarations: RawServoDeclarationBlockBorrowed,
+                                                        property: *const nsACString) {
+    remove_property(declarations, get_property_id_from_property!(property, ()))
+}
+
+#[no_mangle]
+pub extern "C" fn Servo_DeclarationBlock_RemovePropertyById(declarations: RawServoDeclarationBlockBorrowed,
+                                                            property: nsCSSPropertyID) {
+    remove_property(declarations, get_property_id_from_nscsspropertyid!(property, ()))
 }
 
 #[no_mangle]