Changeset 110455 in webkit
- Timestamp:
- Mar 12, 2012 12:20:56 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r110451 r110455 1 2012-03-12 Mike Lawther <mikelawther@chromium.org> 2 3 CSS3 calc: enable mixed percent/absolute for font 4 https://bugs.webkit.org/show_bug.cgi?id=80813 5 6 Reviewed by Ojan Vafai. 7 8 * css3/calc/font-expected.txt: 9 * css3/calc/font-size-expected.txt: 10 1 11 2012-03-12 Mike Reed <reed@google.com> 2 12 -
trunk/LayoutTests/css3/calc/font-expected.txt
r107688 r110455 11 11 PASS getComputedStyle(document.getElementById("calc-both"), null).fontSize is "24px" 12 12 PASS getComputedStyle(document.getElementById("calc-percent-size"), null).lineHeight is "63px" 13 FAIL getComputedStyle(document.getElementById("calc-percent-size"), null).fontSize should be 24px. Was 16px. 13 PASS getComputedStyle(document.getElementById("calc-percent-size"), null).fontSize is "24px" 14 14 PASS successfullyParsed is true 15 15 -
trunk/LayoutTests/css3/calc/font-size-expected.txt
r107688 r110455 5 5 6 6 PASS getComputedStyle(document.getElementById("calc-percent"), null).fontSize is "40px" 7 FAIL getComputedStyle(document.getElementById("calc-percent-pixels"), null).fontSize should be 40px. Was 20px. 7 PASS getComputedStyle(document.getElementById("calc-percent-pixels"), null).fontSize is "40px" 8 8 PASS successfullyParsed is true 9 9 -
trunk/Source/WebCore/ChangeLog
r110450 r110455 1 2012-03-12 Mike Lawther <mikelawther@chromium.org> 2 3 CSS3 calc: enable mixed percent/absolute for font 4 https://bugs.webkit.org/show_bug.cgi?id=80813 5 6 Reviewed by Ojan Vafai. 7 8 Add support for mixed percent/absolute expressions to the font handling class. 9 10 * css/CSSStyleApplyProperty.cpp: 11 (WebCore::ApplyPropertyFontSize::applyValue): 12 1 13 2012-03-12 Andreas Kling <awesomekling@apple.com> 2 14 -
trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp
r110148 r110455 740 740 else if (primitiveValue->isPercentage()) 741 741 size = (primitiveValue->getFloatValue() * parentSize) / 100.0f; 742 else if (primitiveValue->isCalculatedPercentageWithLength()) 743 size = primitiveValue->cssCalcValue()->toCalcValue(selector->parentStyle(), selector->rootElementStyle())->evaluate(parentSize); 742 744 else 743 745 return;
Note: See TracChangeset
for help on using the changeset viewer.