Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #15739 - Disallow keyword values in min/max-size properties in the block direction (from Manishearth:fix-wm); r=xidorn

Browse Source 
r=xidorn from https://bugzilla.mozilla.org/show_bug.cgi?id=1342710

Source-Repo: https://github.com/servo/servo
Source-Revision: f8f7b37dbdb918db25ebf3881478e4e1a4df8e30

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2920b2649d8d660f269a153c61e6e9aa9ac58a3c
This commit is contained in:
Manish Goregaokar 2017-02-25 23:26:34 -08:00
parent afb15861d6
commit ad77e76462
1 changed files with 82 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
servo/components/style/properties/longhand/position.mako.rs
View File

@ -217,16 +217,89 @@ ${helpers.predefined_type("flex-basis",
needs_context=False,
spec=spec % size,
animatable=True, logical = logical)}
% if product == "gecko":
// min-width, min-height, min-block-size, min-inline-size
${helpers.predefined_type("min-%s" % size,
"MinLength",
"computed::MinLength::LengthOrPercentage(" +
"computed::LengthOrPercentage::Length(Au(0)))",
spec=spec % ("min-%s" % size),
animatable=True, logical = logical)}
% for min_max in ["min", "max"]:
<%
MinMax = min_max.title()
initial = "None" if "max" == min_max else "Auto"
%>
// min-width, min-height, min-block-size, min-inline-size,
// max-width, max-height, max-block-size, max-inline-size
//
// Keyword values are only valid in the inline direction; they must
// be replaced with auto/none in block.
<%helpers:longhand name="${min_max}-${size}" spec="${spec % ('%s-%s' % (min_max, size))}"
animatable="True" logical="${logical}" predefined_type="${MinMax}Length">
use std::fmt;
use style_traits::ToCss;
use values::HasViewportPercentage;
use values::specified::${MinMax}Length;
impl HasViewportPercentage for SpecifiedValue {
fn has_viewport_percentage(&self) -> bool {
self.0.has_viewport_percentage()
}
}
pub mod computed_value {
pub type T = ::values::computed::${MinMax}Length;
}
#[derive(PartialEq, Clone, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub struct SpecifiedValue(${MinMax}Length);
#[inline]
pub fn get_initial_value() -> computed_value::T {
use values::computed::${MinMax}Length;
${MinMax}Length::${initial}
}
fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
${MinMax}Length::parse(context, input).map(SpecifiedValue)
}
impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
self.0.to_css(dest)
}
}
impl ToComputedValue for SpecifiedValue {
type ComputedValue = computed_value::T;
#[inline]
fn to_computed_value(&self, context: &Context) -> computed_value::T {
use values::computed::${MinMax}Length;
let computed = self.0.to_computed_value(context);
// filter out keyword values in the block direction
% if logical:
% if "block" in size:
if let ${MinMax}Length::ExtremumLength(..) = computed {
return get_initial_value()
}
% endif
% else:
if let ${MinMax}Length::ExtremumLength(..) = computed {
<% is_height = "true" if "height" in size else "false" %>
if ${is_height} != context.style().writing_mode.is_vertical() {
return get_initial_value()
}
}
% endif
computed
}
#[inline]
fn from_computed_value(computed: &computed_value::T) -> Self {
SpecifiedValue(ToComputedValue::from_computed_value(computed))
}
}
</%helpers:longhand>
% endfor
% else:
// servo versions (no keyword support)
${helpers.predefined_type("min-%s" % size,
"LengthOrPercentage",
"computed::LengthOrPercentage::Length(Au(0))",
@ -234,22 +307,12 @@ ${helpers.predefined_type("flex-basis",
needs_context=False,
spec=spec % ("min-%s" % size),
animatable=True, logical = logical)}
% endif
// max-width, max-height, max-block-size, max-inline-size
% if product == "gecko":
${helpers.predefined_type("max-%s" % size,
"MaxLength",
"computed::MaxLength::None",
spec=spec % ("max-%s" % size),
animatable=True, logical = logical)}
% else:
${helpers.predefined_type("max-%s" % size,
"LengthOrPercentageOrNone",
"computed::LengthOrPercentageOrNone::None",
"parse_non_negative",
needs_context=False,
spec=spec % ("max-%s" % size),
spec=spec % ("min-%s" % size),
animatable=True, logical = logical)}
% endif
% endfor