Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Add support for touch-action:pinch-zoom - Add pinch-zoom support to touchAction.

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D97815
This commit is contained in:
Sunita Sen 2020-11-24 13:33:51 +00:00 • committed by Emilio Cobos Álvarez
parent 85b45cd615
commit 9f20a24e4c
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/values/specified/box.rs
View file

@ -1170,7 +1170,7 @@ bitflags! {
/// Values for the `touch-action` property. /// Values for the `touch-action` property.
#[derive(MallocSizeOf, SpecifiedValueInfo, ToComputedValue, ToResolvedValue, ToShmem)] #[derive(MallocSizeOf, SpecifiedValueInfo, ToComputedValue, ToResolvedValue, ToShmem)]
/// These constants match Gecko's `NS_STYLE_TOUCH_ACTION_*` constants. /// These constants match Gecko's `NS_STYLE_TOUCH_ACTION_*` constants.
#[value_info(other_values = "auto,none,manipulation,pan-x,pan-y")] #[value_info(other_values = "auto,none,manipulation,pan-x,pan-y,pinch-zoom")]
#[repr(C)] #[repr(C)]
pub struct TouchAction: u8 { pub struct TouchAction: u8 {
/// `none` variant /// `none` variant
@ -1183,6 +1183,8 @@ bitflags! {
const PAN_Y = 1 << 3; const PAN_Y = 1 << 3;
/// `manipulation` variant /// `manipulation` variant
const MANIPULATION = 1 << 4; const MANIPULATION = 1 << 4;
/// `pinch-zoom` variant
const PINCH_ZOOM = 1 << 5;
} }
} }
@ -1223,6 +1225,7 @@ impl ToCss for TouchAction {
} }
maybe_write_value!(TouchAction::PAN_X => "pan-x"); maybe_write_value!(TouchAction::PAN_X => "pan-x");
maybe_write_value!(TouchAction::PAN_Y => "pan-y"); maybe_write_value!(TouchAction::PAN_Y => "pan-y");
maybe_write_value!(TouchAction::PINCH_ZOOM => "pinch-zoom");
debug_assert!(has_any); debug_assert!(has_any);
Ok(()) Ok(())
@ -1230,7 +1233,7 @@ impl ToCss for TouchAction {
} }
impl Parse for TouchAction { impl Parse for TouchAction {
/// auto | none | [ pan-x || pan-y ] | manipulation /// auto | none | [ pan-x || pan-y || pinch-zoom ] | manipulation
fn parse<'i, 't>( fn parse<'i, 't>(
_context: &ParserContext, _context: &ParserContext,
input: &mut Parser<'i, 't>, input: &mut Parser<'i, 't>,
@ -1240,6 +1243,7 @@ impl Parse for TouchAction {
let flag = match_ignore_ascii_case! { &name, let flag = match_ignore_ascii_case! { &name,
"pan-x" => Some(TouchAction::PAN_X), "pan-x" => Some(TouchAction::PAN_X),
"pan-y" => Some(TouchAction::PAN_Y), "pan-y" => Some(TouchAction::PAN_Y),
"pinch-zoom" => Some(TouchAction::PINCH_ZOOM),
"none" if result.is_empty() => return Ok(TouchAction::NONE), "none" if result.is_empty() => return Ok(TouchAction::NONE),
"manipulation" if result.is_empty() => return Ok(TouchAction::MANIPULATION), "manipulation" if result.is_empty() => return Ok(TouchAction::MANIPULATION),
"auto" if result.is_empty() => return Ok(TouchAction::AUTO), "auto" if result.is_empty() => return Ok(TouchAction::AUTO),