mirror of
https://github.com/servo/servo.git
synced 2025-08-13 17:35:36 +01:00
Auto merge of #16155 - chenpighead:gecko-glue-for-font-language-override, r=emilio
stylo: Implement gecko glue for font-language-override. To be aligned with the implementation from Gecko side, we parse font-language-override as Normal keyword or String. Then, we compute and store it as a u32. So, as to the stylo glue, we can just pass the u32 to Gecko. The extra crate, byteorder, is used to simplify the computing and serialization. Since we now implement font-language-override for Gecko, we can remove the additional branches for font-language-override in font shorthand. ref: Gecko [Bug 1347821](https://bugzilla.mozilla.org/show_bug.cgi?id=1347821) <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/16155) <!-- Reviewable:end -->
This commit is contained in:
commit
af243d5dec
6 changed files with 103 additions and 39 deletions
|
@ -1177,7 +1177,7 @@ fn static_assert() {
|
|||
</%self:impl_trait>
|
||||
|
||||
<%self:impl_trait style_struct_name="Font"
|
||||
skip_longhands="font-family font-size font-size-adjust font-weight font-synthesis -x-lang"
|
||||
skip_longhands="font-family font-size font-size-adjust font-weight font-synthesis -x-lang font-language-override"
|
||||
skip_additionals="*">
|
||||
|
||||
pub fn set_font_family(&mut self, v: longhands::font_family::computed_value::T) {
|
||||
|
@ -1315,6 +1315,11 @@ fn static_assert() {
|
|||
Gecko_nsStyleFont_CopyLangFrom(&mut self.gecko, &other.gecko);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_font_language_override(&mut self, v: longhands::font_language_override::computed_value::T) {
|
||||
self.gecko.mFont.languageOverride = v.0;
|
||||
}
|
||||
${impl_simple_copy('font_language_override', 'mFont.languageOverride')}
|
||||
</%self:impl_trait>
|
||||
|
||||
<%def name="impl_copy_animation_or_transition_value(type, ident, gecko_ffi_name)">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue