Title: [112125] trunk
- Revision
- 112125
- Author
- [email protected]
- Date
- 2012-03-26 10:45:20 -0700 (Mon, 26 Mar 2012)
Log Message
CSS3 calc: mixed percent/absolute support for vertical-align
https://bugs.webkit.org/show_bug.cgi?id=82152
Reviewed by Ojan Vafai.
Source/WebCore:
Tests: css3/calc/vertical-align-expected.html
css3/calc/vertical-align.html
* css/CSSStyleApplyProperty.cpp:
(WebCore::ApplyPropertyVerticalAlign::applyValue):
LayoutTests:
* css3/calc/vertical-align-expected.html: Added.
* css3/calc/vertical-align.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (112124 => 112125)
--- trunk/LayoutTests/ChangeLog 2012-03-26 17:43:05 UTC (rev 112124)
+++ trunk/LayoutTests/ChangeLog 2012-03-26 17:45:20 UTC (rev 112125)
@@ -1,3 +1,13 @@
+2012-03-26 Mike Lawther <[email protected]>
+
+ CSS3 calc: mixed percent/absolute support for vertical-align
+ https://bugs.webkit.org/show_bug.cgi?id=82152
+
+ Reviewed by Ojan Vafai.
+
+ * css3/calc/vertical-align-expected.html: Added.
+ * css3/calc/vertical-align.html: Added.
+
2012-03-26 Stephen Chenney <[email protected]>
Failure to invalidate text position attributes when DOM changes
Added: trunk/LayoutTests/css3/calc/vertical-align-expected.html (0 => 112125)
--- trunk/LayoutTests/css3/calc/vertical-align-expected.html (rev 0)
+++ trunk/LayoutTests/css3/calc/vertical-align-expected.html 2012-03-26 17:45:20 UTC (rev 112125)
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<style>
+.aligntest {
+ line-height: 16px;
+ vertical-align: -webkit-calc(9px);
+}
+</style>
+<hr/>
+<span class="aligntest">The first four words</span> in this sentence should have a line-height of 16px; they are also (25%+5px)-aligned, which should raise them 9px relative to the natural baseline.
+<hr/>
\ No newline at end of file
Added: trunk/LayoutTests/css3/calc/vertical-align.html (0 => 112125)
--- trunk/LayoutTests/css3/calc/vertical-align.html (rev 0)
+++ trunk/LayoutTests/css3/calc/vertical-align.html 2012-03-26 17:45:20 UTC (rev 112125)
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<style>
+.aligntest {
+ line-height: 16px;
+ vertical-align: -webkit-calc(25% + 5px);
+}
+</style>
+<hr/>
+<span class="aligntest">The first four words</span> in this sentence should have a line-height of 16px; they are also (25%+5px)-aligned, which should raise them 9px relative to the natural baseline.
+<hr/>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (112124 => 112125)
--- trunk/Source/WebCore/ChangeLog 2012-03-26 17:43:05 UTC (rev 112124)
+++ trunk/Source/WebCore/ChangeLog 2012-03-26 17:45:20 UTC (rev 112125)
@@ -1,3 +1,16 @@
+2012-03-26 Mike Lawther <[email protected]>
+
+ CSS3 calc: mixed percent/absolute support for vertical-align
+ https://bugs.webkit.org/show_bug.cgi?id=82152
+
+ Reviewed by Ojan Vafai.
+
+ Tests: css3/calc/vertical-align-expected.html
+ css3/calc/vertical-align.html
+
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::ApplyPropertyVerticalAlign::applyValue):
+
2012-03-26 Filip Spacek <[email protected]>
[BlackBerry] Accelerated compositing updates
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (112124 => 112125)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-26 17:43:05 UTC (rev 112124)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-26 17:45:20 UTC (rev 112125)
@@ -1567,7 +1567,7 @@
if (primitiveValue->getIdent())
return selector->style()->setVerticalAlign(*primitiveValue);
- selector->style()->setVerticalAlignLength(primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion>(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom()));
+ selector->style()->setVerticalAlignLength(primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(selector->style(), selector->rootElementStyle(), selector->style()->effectiveZoom()));
}
static PropertyHandler createHandler()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
