Bug 1505949 - layout/style/{BorrowedTypeList.h,ServoArcTypeList.h,ServoBoxedTypeList.h} content should remain on a single line r=heycam
authorSylvestre Ledru <sledru@mozilla.com>
Fri, 09 Nov 2018 13:31:39 +0000
changeset 445409 ed063368a801e3bec682e03995ee4c0c0bf57eec
parent 445408 8b1dc4b08aabcfbee62035e5f32392791d74645d
child 445410 9349b769c3895fc20d0597992e074ab135f3cd5f
push id35015
push userdluca@mozilla.com
push dateFri, 09 Nov 2018 17:45:20 +0000
treeherdermozilla-central@2f1158e5e0ce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersheycam
bugs1505949
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1505949 - layout/style/{BorrowedTypeList.h,ServoArcTypeList.h,ServoBoxedTypeList.h} content should remain on a single line r=heycam Make sure that clang-format doesn't touch it Differential Revision: https://phabricator.services.mozilla.com/D11387
layout/style/BorrowedTypeList.h
layout/style/ServoArcTypeList.h
layout/style/ServoBoxedTypeList.h
--- a/layout/style/BorrowedTypeList.h
+++ b/layout/style/BorrowedTypeList.h
@@ -23,16 +23,18 @@
 // The second argument is the name of a typedef that will be generated,
 // equivalent to the actual C++ type.  This name will be used as the basis
 // for the generated borrowed type names to be used in FFI signatures in
 // C++ and Rust.  The convention for this name is "RawGecko{Type}", where
 // {Type} is the name of the C++ type or something close to it.
 //
 // See the comment at the top of ServoBindingTypes.h for how to use these.
 
+// clang-format off
+// Needs to be a on single line
 GECKO_BORROWED_TYPE(mozilla::dom::Element, RawGeckoElement)
 GECKO_BORROWED_TYPE(nsIDocument, RawGeckoDocument)
 GECKO_BORROWED_TYPE(nsINode, RawGeckoNode)
 GECKO_BORROWED_TYPE(nsPresContext, RawGeckoPresContext)
 GECKO_BORROWED_TYPE(nsXBLBinding, RawGeckoXBLBinding)
 GECKO_BORROWED_TYPE_MUT(mozilla::AnimationPropertySegment, RawGeckoAnimationPropertySegment)
 GECKO_BORROWED_TYPE_MUT(mozilla::ComputedTiming, RawGeckoComputedTiming)
 GECKO_BORROWED_TYPE_MUT(mozilla::dom::StyleChildrenIterator, RawGeckoStyleChildrenIterator)
@@ -45,8 +47,10 @@ GECKO_BORROWED_TYPE_MUT(nsStyleAutoArray
 GECKO_BORROWED_TYPE_MUT(nsTArray<const RawServoStyleRule*>, RawGeckoServoStyleRuleList)
 GECKO_BORROWED_TYPE_MUT(nsTArray<mozilla::ComputedKeyframeValues>, RawGeckoComputedKeyframeValuesList)
 GECKO_BORROWED_TYPE_MUT(nsTArray<mozilla::Keyframe>, RawGeckoKeyframeList)
 GECKO_BORROWED_TYPE_MUT(nsTArray<mozilla::PropertyValuePair>, RawGeckoPropertyValuePairList)
 GECKO_BORROWED_TYPE_MUT(nsTArray<nsCSSPropertyID>, RawGeckoCSSPropertyIDList)
 GECKO_BORROWED_TYPE_MUT(nsTArray<nsFontFaceRuleContainer>, RawGeckoFontFaceRuleList)
 GECKO_BORROWED_TYPE_MUT(nsTArray<RefPtr<RawServoAnimationValue>>, RawGeckoServoAnimationValueList)
 GECKO_BORROWED_TYPE_MUT(nsTimingFunction, nsTimingFunction)
+// clang-format on
+
--- a/layout/style/ServoArcTypeList.h
+++ b/layout/style/ServoArcTypeList.h
@@ -15,16 +15,18 @@
 // the name of the opaque Gecko type is "RawServo{Type}", where {Type} is
 // the name of the Servo type or something close to it.
 //
 // See the comment at the top of ServoBindingTypes.h for how to use these.
 //
 // If you add an entry to this file, you should also add an impl_arc_ffi!()
 // call to servo/components/style/gecko/arc_types.rs.
 
+// clang-format off
+// Needs to be a on single line
 SERVO_ARC_TYPE(CssRules, ServoCssRules)
 SERVO_ARC_TYPE(StyleSheetContents, RawServoStyleSheetContents)
 SERVO_ARC_TYPE(DeclarationBlock, RawServoDeclarationBlock)
 SERVO_ARC_TYPE(StyleRule, RawServoStyleRule)
 SERVO_ARC_TYPE(ImportRule, RawServoImportRule)
 SERVO_ARC_TYPE(AnimationValue, RawServoAnimationValue)
 SERVO_ARC_TYPE(Keyframe, RawServoKeyframe)
 SERVO_ARC_TYPE(KeyframesRule, RawServoKeyframesRule)
@@ -35,8 +37,9 @@ SERVO_ARC_TYPE(PageRule, RawServoPageRul
 SERVO_ARC_TYPE(SupportsRule, RawServoSupportsRule)
 SERVO_ARC_TYPE(DocumentRule, RawServoMozDocumentRule)
 SERVO_ARC_TYPE(FontFeatureValuesRule, RawServoFontFeatureValuesRule)
 SERVO_ARC_TYPE(RuleNode, RawServoRuleNode)
 SERVO_ARC_TYPE(FontFaceRule, RawServoFontFaceRule)
 SERVO_ARC_TYPE(CounterStyleRule, RawServoCounterStyleRule)
 SERVO_ARC_TYPE(CssUrlData, RawServoCssUrlData)
 SERVO_ARC_TYPE(Quotes, RawServoQuotes)
+// clang-format on
--- a/layout/style/ServoBoxedTypeList.h
+++ b/layout/style/ServoBoxedTypeList.h
@@ -19,13 +19,17 @@
 //
 // If you add an entry to this file, you should also add impls of HasFFI
 // (with FFIType equal to ::gecko_bindings::structs::RawServo{Type}),
 // HasSimpleFFI, and HasBoxFFI to the Servo type. You will also need to
 // add a Servo_{FriendlyServoName}_Drop function to servo/ports/gecko/glue.rs.
 //
 // TODO(heycam): Do some of this automatically.
 
+// clang-format off
+// Needs to be a on single line
 SERVO_BOXED_TYPE(StyleSet, RawServoStyleSet)
 SERVO_BOXED_TYPE(AuthorStyles, RawServoAuthorStyles)
 SERVO_BOXED_TYPE(SelectorList, RawServoSelectorList)
 SERVO_BOXED_TYPE(SourceSizeList, RawServoSourceSizeList)
 SERVO_BOXED_TYPE(UseCounters, StyleUseCounters)
+// clang-format on
+