diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2018-05-11 19:44:46 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2018-05-11 19:44:46 +0000 |
commit | 08f384fd06a468247b6a87830595465b915a32e5 (patch) | |
tree | 6dbe239b26f5c9a865646ddfb8d592fde958c99c /www/waterfox/files/patch-bug1386887 | |
parent | New port: security/py-winrm (diff) |
www/waterfox: update to 56.1.0.89
Changes: https://github.com/MrAlex94/Waterfox/compare/56.1.0...2bb1a86e5dbd6
Diffstat (limited to 'www/waterfox/files/patch-bug1386887')
-rw-r--r-- | www/waterfox/files/patch-bug1386887 | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/www/waterfox/files/patch-bug1386887 b/www/waterfox/files/patch-bug1386887 deleted file mode 100644 index 7421a8d84012..000000000000 --- a/www/waterfox/files/patch-bug1386887 +++ /dev/null @@ -1,89 +0,0 @@ -commit efbe3a9af876 -Author: Manish Goregaokar <manishearth@gmail.com> -Date: Wed Aug 2 11:24:35 2017 -0700 - - Bug 1386887 - Clean up FFI lifetimes to work on nightly; r=emilio - - MozReview-Commit-ID: 5WAIVd6p2du ---- - layout/style/ServoBindingList.h | 4 ++-- - layout/style/ServoBindingTypes.h | 2 ++ - layout/style/ServoBindings.h | 4 ++-- - layout/style/ServoBindings.toml | 4 +++- - 4 files changed, 9 insertions(+), 5 deletions(-) - -diff --git layout/style/ServoBindingList.h layout/style/ServoBindingList.h -index 6c669ebb3d3e..87ade14ea4de 100644 ---- layout/style/ServoBindingList.h -+++ layout/style/ServoBindingList.h -@@ -379,10 +379,10 @@ SERVO_BINDING_FUNC(Servo_DeclarationBlock_HasCSSWideKeyword, bool, - nsCSSPropertyID property) - // Compose animation value for a given property. - // |base_values| is nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>. --// We use void* to avoid exposing nsRefPtrHashtable in FFI. -+// We use RawServoAnimationValueTableBorrowed to avoid exposing nsRefPtrHashtable in FFI. - SERVO_BINDING_FUNC(Servo_AnimationCompose, void, - RawServoAnimationValueMapBorrowedMut animation_values, -- void* base_values, -+ RawServoAnimationValueTableBorrowed base_values, - nsCSSPropertyID property, - RawGeckoAnimationPropertySegmentBorrowed animation_segment, - RawGeckoAnimationPropertySegmentBorrowed last_segment, -diff --git layout/style/ServoBindingTypes.h layout/style/ServoBindingTypes.h -index aaf4fc27e1b9..69be15ee9f51 100644 ---- layout/style/ServoBindingTypes.h -+++ layout/style/ServoBindingTypes.h -@@ -54,6 +54,8 @@ class nsXBLBinding; - using mozilla::dom::StyleChildrenIterator; - using mozilla::ServoElementSnapshot; - -+typedef void* RawServoAnimationValueTableBorrowed; -+ - typedef nsINode RawGeckoNode; - typedef mozilla::dom::Element RawGeckoElement; - typedef nsIDocument RawGeckoDocument; -diff --git layout/style/ServoBindings.h layout/style/ServoBindings.h -index 493ca63f932b..c6ced6d1fedb 100644 ---- layout/style/ServoBindings.h -+++ layout/style/ServoBindings.h -@@ -268,9 +268,9 @@ double Gecko_GetPositionInSegment( - // Get servo's AnimationValue for |aProperty| from the cached base style - // |aBaseStyles|. - // |aBaseStyles| is nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>. --// We use void* to avoid exposing nsRefPtrHashtable in FFI. -+// We use RawServoAnimationValueTableBorrowed to avoid exposing nsRefPtrHashtable in FFI. - RawServoAnimationValueBorrowedOrNull Gecko_AnimationGetBaseStyle( -- void* aBaseStyles, -+ RawServoAnimationValueTableBorrowed aBaseStyles, - nsCSSPropertyID aProperty); - void Gecko_StyleTransition_SetUnsupportedProperty( - mozilla::StyleTransition* aTransition, -diff --git layout/style/ServoBindings.toml layout/style/ServoBindings.toml -index 11e372541235..3c3902beea80 100644 ---- layout/style/ServoBindings.toml -+++ layout/style/ServoBindings.toml -@@ -357,6 +357,7 @@ raw-lines = [ - "pub type ServoStyleContextBorrowed<'a> = &'a ::properties::ComputedValues;", - "pub type ServoStyleContextBorrowedOrNull<'a> = Option<&'a ::properties::ComputedValues>;", - "pub type ServoComputedDataBorrowed<'a> = &'a ServoComputedData;", -+ "pub type RawServoAnimationValueTableBorrowed<'a> = &'a ();" - ] - whitelist-functions = ["Servo_.*", "Gecko_.*"] - structs-types = [ -@@ -389,7 +390,7 @@ structs-types = [ - "RawGeckoPresContext", - "RawGeckoPresContextOwned", - "RawGeckoStyleAnimationList", -- "RawGeckoStyleChildrenIteratorBorrowedMut", -+ "RawGeckoStyleChildrenIterator", - "RawGeckoServoStyleRuleList", - "RawGeckoURLExtraData", - "RawGeckoXBLBinding", -@@ -526,6 +527,7 @@ servo-borrow-types = [ - "RawGeckoFontFaceRuleList", - "RawGeckoServoStyleRuleList", - "RawGeckoServoAnimationValueList", -+ "RawGeckoStyleChildrenIterator", - ] - fixups = [ - # hack for gecko-owned string |