projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c70ba5)
CSS3 calc: mixed percent/absolute support for vertical-align
authormikelawther@chromium.org <mikelawther@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Mar 2012 17:45:20 +0000 (17:45 +0000)
committermikelawther@chromium.org <mikelawther@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Mar 2012 17:45:20 +0000 (17:45 +0000)
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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/css3/calc/vertical-align-expected.html [new file with mode: 0644] patch | blob
LayoutTests/css3/calc/vertical-align.html [new file with mode: 0644] patch | blob
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/css/CSSStyleApplyProperty.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 671262a..9ee31db 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-26  Mike Lawther  <mikelawther@chromium.org>
+
+        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  <schenney@chromium.org>
 
         Failure to invalidate text position attributes when DOM changes 
diff --git a/LayoutTests/css3/calc/vertical-align-expected.html b/LayoutTests/css3/calc/vertical-align-expected.html
new file mode 100644 (file)
index 0000000..4489a36
--- /dev/null
+++ b/LayoutTests/css3/calc/vertical-align-expected.html
@@ -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
diff --git a/LayoutTests/css3/calc/vertical-align.html b/LayoutTests/css3/calc/vertical-align.html
new file mode 100644 (file)
index 0000000..faf6d3c
--- /dev/null
+++ b/LayoutTests/css3/calc/vertical-align.html
@@ -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
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 9891d4e..72781e8 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-26  Mike Lawther  <mikelawther@chromium.org>
+
+        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  <fspacek@rim.com>
 
         [BlackBerry] Accelerated compositing updates
diff --git a/Source/WebCore/css/CSSStyleApplyProperty.cpp b/Source/WebCore/css/CSSStyleApplyProperty.cpp
index 5a1ec71..836f722 100644 (file)
--- a/Source/WebCore/css/CSSStyleApplyProperty.cpp
+++ b/Source/WebCore/css/CSSStyleApplyProperty.cpp
@@ -1567,7 +1567,7 @@ public:
         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()
Domain: Web Framework / Uncategorized;