Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 15:35:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Rename pointing to inherited_ui.

Browse source 
And also merge values::*::pointing into values::*::ui.

Bug: 1460192
Reviewed-by: heycam
MozReview-Commit-ID: FM4gWEszahB
This commit is contained in:
Xidorn Quan 2018-05-09 16:07:36 +10:00 • committed by Emilio Cobos Álvarez
parent 4ab0e85ed5
commit db0134e697
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
12 changed files with 103 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/style/properties/gecko.mako.rs
View file

@ -4108,10 +4108,6 @@ fn static_assert() {
unsafe {
Gecko_SetListStyleImageImageValue(&mut self.gecko, url.image_value.get());
}
// We don't need to record this struct as uncacheable, like when setting
// background-image to a url() value, since only properties in reset structs
// are re-used from the applicable declaration cache, and the List struct
// is an inherited struct.
}
}
}
@ -5266,7 +5262,7 @@ clip-path
}
</%self:impl_trait>
<%self:impl_trait style_struct_name="Pointing"
<%self:impl_trait style_struct_name="InheritedUI"
skip_longhands="cursor caret-color">
pub fn set_cursor(&mut self, v: longhands::cursor::computed_value::T) {
use style_traits::cursor::CursorKind;
@ -5326,11 +5322,6 @@ clip-path
);
}
// We don't need to record this struct as uncacheable, like when setting
// background-image to a url() value, since only properties in reset structs
// are re-used from the applicable declaration cache, and the Pointing struct
// is an inherited struct.
match v.images[i].hotspot {
Some((x, y)) => {
self.gecko.mCursorImages[i].mHaveHotspot = true;
@ -5356,7 +5347,7 @@ clip-path
}
pub fn clone_cursor(&self) -> longhands::cursor::computed_value::T {
use values::computed::pointing::CursorImage;
use values::computed::ui::CursorImage;
use style_traits::cursor::CursorKind;
use values::specified::url::SpecifiedImageUrl;

4
components/style/properties/longhand/pointing.mako.rs → components/style/properties/longhand/inherited_ui.mako.rs
View file

@ -4,7 +4,7 @@
<%namespace name="helpers" file="/helpers.mako.rs" />
<% data.new_style_struct("Pointing", inherited=True, gecko_name="UserInterface") %>
<% data.new_style_struct("InheritedUI", inherited=True, gecko_name="UserInterface") %>
${helpers.predefined_type("cursor",
"Cursor",
@ -44,7 +44,7 @@ ${helpers.single_keyword("-moz-user-focus",
${helpers.predefined_type(
"caret-color",
"CaretColor",
"generics::pointing::CaretColor::Auto",
"generics::ui::CaretColor::Auto",
spec="https://drafts.csswg.org/css-ui/#caret-color",
animation_value_type="AnimatedCaretColor",
ignored_when_colors_disabled=True,

2
components/style/properties/properties.mako.rs
View file

@ -109,11 +109,11 @@ pub mod longhands {
<%include file="/longhand/inherited_box.mako.rs" />
<%include file="/longhand/inherited_table.mako.rs" />
<%include file="/longhand/inherited_text.mako.rs" />
<%include file="/longhand/inherited_ui.mako.rs" />
<%include file="/longhand/list.mako.rs" />
<%include file="/longhand/margin.mako.rs" />
<%include file="/longhand/outline.mako.rs" />
<%include file="/longhand/padding.mako.rs" />
<%include file="/longhand/pointing.mako.rs" />
<%include file="/longhand/position.mako.rs" />
<%include file="/longhand/table.mako.rs" />
<%include file="/longhand/text.mako.rs" />