Commit 0f88c1a1 authored by Morris Tseng's avatar Morris Tseng
Browse files

Bug 594933 - Part 2: Add support for calc() to line-height. r=dbaron 

--HG--
extra : commitid : ISfJfHKpK5Z
parent 99b81927

layout/reftests/css-calc/line-height-1-ref.html

0 → 100644
+62 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<style>

div {

 width:100px;

 height:600px;

 margin:5px 0 0 5px;

 font-size: 30px;

 float:left;

}

div#one {

 line-height: 300%;

}

div#two {

 line-height: 100px;

}

div#three {

 line-height: 110px;

}

div#four {

 line-height: 20px;

}

div#five {

 line-height: 12px;

}

div#six {

 line-height: 12px;

}

div#seven {

 line-height: 12px;

}

div#eight {

 line-height: 12px;

}

div#nine {

 line-height: 12px;

}

div#nine {

 line-height: 12px;

}

div#ten {

 line-height: 12px;

}

div#div-11 {

 line-height: 15px;

}

div#div-12 {

 line-height: 195px;

}

</style>

<div id="one">line height is 300%</div>

<div id="two">line height is 100px</div>

<div id="three">line height is 50px</div>

<div id="four">line height is 10px * 2</div>

<div id="five">line height is 50% - 3px</div>

<div id="six">line height is 25% - 3px + 25%</div>

<div id="seven">line height is 25% - 3px + 12.5% * 2</div>

<div id="eight">line height is 25% - 3px + 12.5%*2</div>

<div id="nine">line height is 25% - 3px + 2*12.5%</div>

<div id="ten">line height is 25% - 3px + 2 * 12.5%</div>

<div id="div-11">line height is 30% + 20%</div>

<div id="div-12">line height is 3 * 2 + 3 / 6</div>

</html>

layout/reftests/css-calc/line-height-1.html

0 → 100644
+62 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<style>

div {

 width:100px;

 height:600px;

 margin:5px 0 0 5px;

 font-size: 30px;

 float:left;

}

div#one {

 line-height: calc(300%);

}

div#two {

 line-height: calc(100px);

}

div#three {

 line-height: calc(20px + 300%); 

}

div#four {

 line-height: calc(10px * 2);

}

div#five {

 line-height: calc(50% - 3px);

}

div#six {

 line-height: calc(25% - 3px + 25%);

}

div#seven {

 line-height: calc(25% - 3px + 12.5% * 2);

}

div#eight {

 line-height: calc(25% - 3px + 12.5%*2);

}

div#nine {

 line-height: calc(25% - 3px + 2 * 12.5%);

}

div#nine {

 line-height: calc(25% - 3px + 2*12.5%);

}

div#ten {

 line-height: calc(25% - 3px + 2 * 12.5%);

}

div#div-11 {

 line-height: calc(30% + 20%);

}

div#div-12 {

 line-height: calc(3 * 2 + 3 / 6);

}

</style>

<div id="one">line height is 300%</div>

<div id="two">line height is 100px</div>

<div id="three">line height is 50px</div>

<div id="four">line height is 10px * 2</div>

<div id="five">line height is 50% - 3px</div>

<div id="six">line height is 25% - 3px + 25%</div>

<div id="seven">line height is 25% - 3px + 12.5% * 2</div>

<div id="eight">line height is 25% - 3px + 12.5%*2</div>

<div id="nine">line height is 25% - 3px + 2*12.5%</div>

<div id="ten">line height is 25% - 3px + 2 * 12.5%</div>

<div id="div-11">line height is 30% + 20%</div>

<div id="div-12">line height is 3 * 2 + 3 / 6</div>

</html>

layout/reftests/css-calc/reftest.list

+1 −0
Original line number Diff line number Diff line 
== background-image-gradient-1.html background-image-gradient-1-ref.html

== line-height-1.html line-height-1-ref.html

layout/style/nsCSSParser.cpp

+4 −4
Original line number Diff line number Diff line
@@ -13559,10 +13559,10 @@ CSSParserImpl::ParseFont() 
  // Get optional "/" line-height

  nsCSSValue  lineHeight;

  if (ExpectSymbol('/', true)) {

    if (!ParseSingleTokenNonNegativeVariant(lineHeight,

    if (ParseNonNegativeVariant(lineHeight,

                                VARIANT_NUMBER | VARIANT_LP |

                                              VARIANT_NORMAL,

                                            nullptr)) {

                                  VARIANT_NORMAL | VARIANT_CALC,

                                nullptr) != CSSParseResult::Ok) {

      return false;

    }

  }

layout/style/nsCSSPropList.h

+1 −1
Original line number Diff line number Diff line
@@ -2272,7 +2272,7 @@ CSS_PROP_TEXT( 
        CSS_PROPERTY_APPLIES_TO_PLACEHOLDER |

        CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH,

    "",

    VARIANT_HLPN | VARIANT_KEYWORD | VARIANT_NORMAL | VARIANT_SYSFONT,

    VARIANT_HLPN | VARIANT_KEYWORD | VARIANT_NORMAL | VARIANT_SYSFONT | VARIANT_CALC,

    kLineHeightKTable,

    offsetof(nsStyleText, mLineHeight),

    eStyleAnimType_Coord)