Bug 1378076 - Part 2: make cursor animatable. r?hiro
In this patch, make following properties animatable.
* cursor
MozReview-Commit-ID: B18RkFtub0y
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -4664,26 +4664,102 @@ clip-path
Gecko_SetCursorImageValue(&mut self.gecko.mCursorImages[i],
v.images[i].url.clone().image_value.unwrap().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 Pointing struct
// is an inherited struct.
+
+ match v.images[i].hotspot {
+ Some((x, y)) => {
+ self.gecko.mCursorImages[i].mHaveHotspot = true;
+ self.gecko.mCursorImages[i].mHotspotX = x;
+ self.gecko.mCursorImages[i].mHotspotY = y;
+ },
+ _ => {
+ self.gecko.mCursorImages[i].mHaveHotspot = false;
+ }
+ }
}
}
pub fn copy_cursor_from(&mut self, other: &Self) {
self.gecko.mCursor = other.gecko.mCursor;
unsafe {
Gecko_CopyCursorArrayFrom(&mut self.gecko, &other.gecko);
}
}
+ pub fn clone_cursor(&self) -> longhands::cursor::computed_value::T {
+ use properties::longhands::cursor::computed_value::{Keyword, Image};
+ use style_traits::cursor::Cursor;
+ use values::specified::url::SpecifiedUrl;
+
+ let keyword = match self.gecko.mCursor as u32 {
+ structs::NS_STYLE_CURSOR_AUTO => Keyword::Auto,
+ structs::NS_STYLE_CURSOR_NONE => Keyword::Cursor(Cursor::None),
+ structs::NS_STYLE_CURSOR_DEFAULT => Keyword::Cursor(Cursor::Default),
+ structs::NS_STYLE_CURSOR_POINTER => Keyword::Cursor(Cursor::Pointer),
+ structs::NS_STYLE_CURSOR_CONTEXT_MENU => Keyword::Cursor(Cursor::ContextMenu),
+ structs::NS_STYLE_CURSOR_HELP => Keyword::Cursor(Cursor::Help),
+ structs::NS_STYLE_CURSOR_SPINNING => Keyword::Cursor(Cursor::Progress),
+ structs::NS_STYLE_CURSOR_WAIT => Keyword::Cursor(Cursor::Wait),
+ structs::NS_STYLE_CURSOR_CELL => Keyword::Cursor(Cursor::Cell),
+ structs::NS_STYLE_CURSOR_CROSSHAIR => Keyword::Cursor(Cursor::Crosshair),
+ structs::NS_STYLE_CURSOR_TEXT => Keyword::Cursor(Cursor::Text),
+ structs::NS_STYLE_CURSOR_VERTICAL_TEXT => Keyword::Cursor(Cursor::VerticalText),
+ structs::NS_STYLE_CURSOR_ALIAS => Keyword::Cursor(Cursor::Alias),
+ structs::NS_STYLE_CURSOR_COPY => Keyword::Cursor(Cursor::Copy),
+ structs::NS_STYLE_CURSOR_MOVE => Keyword::Cursor(Cursor::Move),
+ structs::NS_STYLE_CURSOR_NO_DROP => Keyword::Cursor(Cursor::NoDrop),
+ structs::NS_STYLE_CURSOR_NOT_ALLOWED => Keyword::Cursor(Cursor::NotAllowed),
+ structs::NS_STYLE_CURSOR_GRAB => Keyword::Cursor(Cursor::Grab),
+ structs::NS_STYLE_CURSOR_GRABBING => Keyword::Cursor(Cursor::Grabbing),
+ structs::NS_STYLE_CURSOR_E_RESIZE => Keyword::Cursor(Cursor::EResize),
+ structs::NS_STYLE_CURSOR_N_RESIZE => Keyword::Cursor(Cursor::NResize),
+ structs::NS_STYLE_CURSOR_NE_RESIZE => Keyword::Cursor(Cursor::NeResize),
+ structs::NS_STYLE_CURSOR_NW_RESIZE => Keyword::Cursor(Cursor::NwResize),
+ structs::NS_STYLE_CURSOR_S_RESIZE => Keyword::Cursor(Cursor::SResize),
+ structs::NS_STYLE_CURSOR_SE_RESIZE => Keyword::Cursor(Cursor::SeResize),
+ structs::NS_STYLE_CURSOR_SW_RESIZE => Keyword::Cursor(Cursor::SwResize),
+ structs::NS_STYLE_CURSOR_W_RESIZE => Keyword::Cursor(Cursor::WResize),
+ structs::NS_STYLE_CURSOR_EW_RESIZE => Keyword::Cursor(Cursor::EwResize),
+ structs::NS_STYLE_CURSOR_NS_RESIZE => Keyword::Cursor(Cursor::NsResize),
+ structs::NS_STYLE_CURSOR_NESW_RESIZE => Keyword::Cursor(Cursor::NeswResize),
+ structs::NS_STYLE_CURSOR_NWSE_RESIZE => Keyword::Cursor(Cursor::NwseResize),
+ structs::NS_STYLE_CURSOR_COL_RESIZE => Keyword::Cursor(Cursor::ColResize),
+ structs::NS_STYLE_CURSOR_ROW_RESIZE => Keyword::Cursor(Cursor::RowResize),
+ structs::NS_STYLE_CURSOR_ALL_SCROLL => Keyword::Cursor(Cursor::AllScroll),
+ structs::NS_STYLE_CURSOR_ZOOM_IN => Keyword::Cursor(Cursor::ZoomIn),
+ structs::NS_STYLE_CURSOR_ZOOM_OUT => Keyword::Cursor(Cursor::ZoomOut),
+ x => panic!("Found unexpected value in style struct for cursor property: {:?}", x),
+ };
+
+ let images = self.gecko.mCursorImages.iter().map(|gecko_cursor_image| {
+ let url = unsafe {
+ let gecko_image_request = gecko_cursor_image.mImage.mRawPtr.as_ref().unwrap();
+ SpecifiedUrl::from_image_request(&gecko_image_request)
+ .expect("mCursorImages.mImage could not convert to SpecifiedUrl")
+ };
+
+ let hotspot =
+ if gecko_cursor_image.mHaveHotspot {
+ Some((gecko_cursor_image.mHotspotX, gecko_cursor_image.mHotspotY))
+ } else {
+ None
+ };
+
+ Image { url, hotspot }
+ }).collect();
+
+ longhands::cursor::computed_value::T { images, keyword }
+ }
+
<%call expr="impl_color('caret_color', 'mCaretColor', need_clone=True)"></%call>
</%self:impl_trait>
<%self:impl_trait style_struct_name="Column"
skip_longhands="column-count column-rule-width">
#[allow(unused_unsafe)]
pub fn set_column_count(&mut self, v: longhands::column_count::computed_value::T) {
--- a/servo/components/style/properties/longhand/pointing.mako.rs
+++ b/servo/components/style/properties/longhand/pointing.mako.rs
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
<%namespace name="helpers" file="/helpers.mako.rs" />
<% data.new_style_struct("Pointing", inherited=True, gecko_name="UserInterface") %>
-<%helpers:longhand name="cursor" boxed="${product == 'gecko'}" animation_value_type="none"
+<%helpers:longhand name="cursor" boxed="${product == 'gecko'}" animation_value_type="discrete"
spec="https://drafts.csswg.org/css-ui/#cursor">
pub use self::computed_value::T as SpecifiedValue;
use values::computed::ComputedValueAsSpecified;
#[cfg(feature = "gecko")]
use values::specified::url::SpecifiedUrl;
impl ComputedValueAsSpecified for SpecifiedValue {}
no_viewport_percentage!(SpecifiedValue);