Bug 1572805 - Use cbindgen for text-emphasis-style. r=boris

I sent mozilla/cbindgen#377 since I got sick of
copy-pasting the private default constructor stuff :)

Differential Revision: https://phabricator.services.mozilla.com/D41419

UltraBlame original commit: 849ca4b3f9de609933014881329f51dc897e13b5

layout/generic/nsLineLayout.cpp

@@ -13183,7 +13183,7 @@ if
 aStyleText
 -
 >
-HasTextEmphasis
+HasEffectiveTextEmphasis
 (
 )
 )
@@ -18297,7 +18297,7 @@ if
 mStyleText
 -
 >
-HasTextEmphasis
+HasEffectiveTextEmphasis
 (
 )
 )
@@ -25844,7 +25844,7 @@ StyleText
 )
 -
 >
-HasTextEmphasis
+HasEffectiveTextEmphasis
 (
 )
 |

layout/generic/nsTextFrame.cpp

@@ -15206,7 +15206,7 @@ if
 textStyle
 -
 >
-HasTextEmphasis
+HasEffectiveTextEmphasis
 (
 )
 )
@@ -36617,6 +36617,236 @@ EmphasisMarkProperty
 EmphasisMarkInfo
 )
 static
+void
+ComputeTextEmphasisStyleString
+(
+const
+StyleTextEmphasisStyle
+&
+aStyle
+nsAString
+&
+aOut
+)
+{
+MOZ_ASSERT
+(
+!
+aStyle
+.
+IsNone
+(
+)
+)
+;
+if
+(
+aStyle
+.
+IsString
+(
+)
+)
+{
+nsDependentCSubstring
+string
+=
+aStyle
+.
+AsString
+(
+)
+.
+AsString
+(
+)
+;
+AppendUTF8toUTF16
+(
+string
+aOut
+)
+;
+return
+;
+}
+const
+auto
+&
+keyword
+=
+aStyle
+.
+AsKeyword
+(
+)
+;
+const
+bool
+fill
+=
+keyword
+.
+fill
+=
+=
+StyleTextEmphasisFillMode
+:
+:
+Filled
+;
+switch
+(
+keyword
+.
+shape
+)
+{
+case
+StyleTextEmphasisShapeKeyword
+:
+:
+Dot
+:
+return
+aOut
+.
+AppendLiteral
+(
+fill
+?
+u
+"
+\
+u2022
+"
+:
+u
+"
+\
+u25e6
+"
+)
+;
+case
+StyleTextEmphasisShapeKeyword
+:
+:
+Circle
+:
+return
+aOut
+.
+AppendLiteral
+(
+fill
+?
+u
+"
+\
+u25cf
+"
+:
+u
+"
+\
+u25cb
+"
+)
+;
+case
+StyleTextEmphasisShapeKeyword
+:
+:
+DoubleCircle
+:
+return
+aOut
+.
+AppendLiteral
+(
+fill
+?
+u
+"
+\
+u25c9
+"
+:
+u
+"
+\
+u25ce
+"
+)
+;
+case
+StyleTextEmphasisShapeKeyword
+:
+:
+Triangle
+:
+return
+aOut
+.
+AppendLiteral
+(
+fill
+?
+u
+"
+\
+u25b2
+"
+:
+u
+"
+\
+u25b3
+"
+)
+;
+case
+StyleTextEmphasisShapeKeyword
+:
+:
+Sesame
+:
+return
+aOut
+.
+AppendLiteral
+(
+fill
+?
+u
+"
+\
+ufe45
+"
+:
+u
+"
+\
+ufe46
+"
+)
+;
+default
+:
+MOZ_ASSERT_UNREACHABLE
+(
+"
+Unknown
+emphasis
+style
+shape
+"
+)
+;
+}
+}
+static
 already_AddRefed
 <
 gfxTextRun
@@ -36638,15 +36868,17 @@ nsStyleText
 aStyleText
 )
 {
-const
-nsString
-&
-emphasisString
-=
+nsAutoString
+string
+;
+ComputeTextEmphasisStyleString
+(
 aStyleText
 -
 >
-mTextEmphasisStyleString
+mTextEmphasisStyle
+string
+)
 ;
 RefPtr
 <
@@ -36735,12 +36967,12 @@ MakeTextRun
 char16_t
 >
 (
-emphasisString
+string
 .
 get
 (
 )
-emphasisString
+string
 .
 Length
 (
@@ -36866,7 +37098,7 @@ if
 styleText
 -
 >
-HasTextEmphasis
+HasEffectiveTextEmphasis
 (
 )
 )
@@ -50149,7 +50381,7 @@ StyleText
 )
 -
 >
-HasTextEmphasis
+HasEffectiveTextEmphasis
 (
 )
 )

layout/style/ServoBindings.toml

@@ -4985,6 +4985,27 @@ grid
 GridTemplateComponent
 "
 }
+{
+gecko
+=
+"
+StyleTextEmphasisStyle
+"
+servo
+=
+"
+values
+:
+:
+computed
+:
+:
+text
+:
+:
+TextEmphasisStyle
+"
+}
 ]
 mapped
 -