Title: [112126] trunk
- Revision
- 112126
- Author
- [email protected]
- Date
- 2012-03-26 10:48:45 -0700 (Mon, 26 Mar 2012)
Log Message
CSS3 calc: mixed percent/absolute for box-reflect
https://bugs.webkit.org/show_bug.cgi?id=82161
Reviewed by Ojan Vafai.
Source/WebCore:
Tests: css3/calc/box-reflect-expected.html
css3/calc/box-reflect.html
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::collectMatchingRulesForList):
LayoutTests:
* css3/calc/box-reflect-expected.html: Added.
* css3/calc/box-reflect.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (112125 => 112126)
--- trunk/LayoutTests/ChangeLog 2012-03-26 17:45:20 UTC (rev 112125)
+++ trunk/LayoutTests/ChangeLog 2012-03-26 17:48:45 UTC (rev 112126)
@@ -1,5 +1,15 @@
2012-03-26 Mike Lawther <[email protected]>
+ CSS3 calc: mixed percent/absolute for box-reflect
+ https://bugs.webkit.org/show_bug.cgi?id=82161
+
+ Reviewed by Ojan Vafai.
+
+ * css3/calc/box-reflect-expected.html: Added.
+ * css3/calc/box-reflect.html: Added.
+
+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
Added: trunk/LayoutTests/css3/calc/box-reflect-expected.html (0 => 112126)
--- trunk/LayoutTests/css3/calc/box-reflect-expected.html (rev 0)
+++ trunk/LayoutTests/css3/calc/box-reflect-expected.html 2012-03-26 17:48:45 UTC (rev 112126)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<style>
+#reflection {
+ width: 100px;
+ height: 100px;
+ -webkit-box-reflect: below 15px;
+}
+</style>
+<img id="reflection" src=""
Added: trunk/LayoutTests/css3/calc/box-reflect.html (0 => 112126)
--- trunk/LayoutTests/css3/calc/box-reflect.html (rev 0)
+++ trunk/LayoutTests/css3/calc/box-reflect.html 2012-03-26 17:48:45 UTC (rev 112126)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<style>
+#reflection {
+ width: 100px;
+ height: 100px;
+ -webkit-box-reflect: below -webkit-calc(10% + 5px);
+}
+</style>
+<img id="reflection" src=""
Modified: trunk/Source/WebCore/ChangeLog (112125 => 112126)
--- trunk/Source/WebCore/ChangeLog 2012-03-26 17:45:20 UTC (rev 112125)
+++ trunk/Source/WebCore/ChangeLog 2012-03-26 17:48:45 UTC (rev 112126)
@@ -1,5 +1,18 @@
2012-03-26 Mike Lawther <[email protected]>
+ CSS3 calc: mixed percent/absolute for box-reflect
+ https://bugs.webkit.org/show_bug.cgi?id=82161
+
+ Reviewed by Ojan Vafai.
+
+ Tests: css3/calc/box-reflect-expected.html
+ css3/calc/box-reflect.html
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
+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
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (112125 => 112126)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-26 17:45:20 UTC (rev 112125)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-26 17:48:45 UTC (rev 112126)
@@ -3388,7 +3388,7 @@
RefPtr<StyleReflection> reflection = StyleReflection::create();
reflection->setDirection(reflectValue->direction());
if (reflectValue->offset())
- reflection->setOffset(reflectValue->offset()->convertToLength<FixedIntegerConversion | PercentConversion>(style(), m_rootElementStyle, zoomFactor));
+ reflection->setOffset(reflectValue->offset()->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(style(), m_rootElementStyle, zoomFactor));
NinePieceImage mask;
mask.setMaskDefaults();
mapNinePieceImage(property, reflectValue->mask(), mask);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
