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

Only count outline width in overflow calculation if outline style is active.

Browse source 
This fixes layers being created with a 3x3 border that's not needed.

This exposes https://github.com/servo/servo/issues/6250, so update the affected reftest to use ahem font until it is fixed.
This commit is contained in:
Glenn Watson 2015-06-02 09:43:38 +10:00
parent d08995e1a9
commit 958adc0f2b
4 changed files with 48 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -294,13 +294,38 @@ pub mod longhands {
</%self:longhand>
<%self:longhand name="outline-width">
pub use super::border_top_width::get_initial_value;
pub type SpecifiedValue = specified::Length;
pub mod computed_value {
pub use util::geometry::Au as T;
use values::computed::{ToComputedValue, Context};
use util::geometry::Au;
use cssparser::ToCss;
use std::fmt;
impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
self.0.to_css(dest)
}
}
pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
specified::parse_border_width(input)
specified::parse_border_width(input).map(SpecifiedValue)
}
#[derive(Clone, PartialEq)]
pub struct SpecifiedValue(pub specified::Length);
pub mod computed_value {
use util::geometry::Au;
pub type T = Au;
}
pub use super::border_top_width::get_initial_value;
impl ToComputedValue for SpecifiedValue {
type ComputedValue = computed_value::T;
#[inline]
fn to_computed_value(&self, context: &Context) -> computed_value::T {
if !context.outline_style_present {
Au(0)
} else {
self.0.to_computed_value(context)
}
}
}
</%self:longhand>
@ -4475,6 +4500,7 @@ pub mod shorthands {
<%self:shorthand name="outline" sub_properties="outline-color outline-style outline-width">
use values::specified;
use properties::longhands::outline_width;
let _unused = context;
let mut color = None;
@ -4497,7 +4523,7 @@ pub mod shorthands {
}
}
if width.is_none() {
if let Ok(value) = input.try(specified::parse_border_width) {
if let Ok(value) = input.try(|input| outline_width::parse(context, input)) {
width = Some(value);
any = true;
continue
@ -5499,6 +5525,7 @@ pub fn cascade(viewport_size: Size2D<Au>,
border_right_present: false,
border_bottom_present: false,
border_left_present: false,
outline_style_present: false,
}
};
@ -5569,6 +5596,13 @@ pub fn cascade(viewport_size: Size2D<Au>,
PropertyDeclaration::TextDecoration(ref value) => {
context.text_decoration = get_specified!(get_text, text_decoration, value);
}
PropertyDeclaration::OutlineStyle(ref value) => {
context.outline_style_present =
match get_specified!(get_outline, outline_style, value) {
BorderStyle::none => false,
_ => true,
};
}
% for side in ["top", "right", "bottom", "left"]:
PropertyDeclaration::Border${side.capitalize()}Style(ref value) => {
context.border_${side}_present =

3
components/style/values.rs
View file

@ -920,7 +920,8 @@ pub mod computed {
pub border_bottom_present: bool,
pub border_left_present: bool,
pub is_root_element: bool,
pub viewport_size: Size2D<Au>
pub viewport_size: Size2D<Au>,
pub outline_style_present: bool,
// TODO, as needed: viewport size, etc.
}

1
tests/ref/inline_block_stacking_context_a.html
View file

@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" href="css/ahem.css">
<style type="text/css">
* {
margin: 0;

1
tests/ref/inline_block_stacking_context_ref.html
View file

@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" href="css/ahem.css">
<style type="text/css">
* {
margin: 0;