git://git.webkit.org / WebKit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 0ff115d)
getComputedStyle for padding is not implemented.
authoralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Dec 2011 18:36:52 +0000 (18:36 +0000)
committeralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Dec 2011 18:36:52 +0000 (18:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=75352

Reviewed by Andreas Kling.

Source/WebCore:

Implement getComputedStyle for padding shorthand property.

Test: fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

LayoutTests:

Add test to cover that we return correct values.

* fast/css/getComputedStyle/getComputedStyle-padding-shorthand-expected.txt: Added.
* fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html: Added.

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html [new file with mode: 0644] patch | blob
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/css/CSSComputedStyleDeclaration.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e90122a..f0e764d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-12-29  Alexis Menard  <alexis.menard@openbossa.org>
+
+        getComputedStyle for padding is not implemented.
+        https://bugs.webkit.org/show_bug.cgi?id=75352
+
+        Reviewed by Andreas Kling.
+
+        Add test to cover that we return correct values.
+
+        * fast/css/getComputedStyle/getComputedStyle-padding-shorthand-expected.txt: Added.
+        * fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html: Added.
+
 2011-12-29  Dale Curtis  <dalecurtis@chromium.org>
 
         [GTK] media/video-scales-in-media-document.html fails
diff --git a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand-expected.txt b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand-expected.txt
new file mode 100644 (file)
index 0000000..7c8c9b3
--- /dev/null
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand-expected.txt
@@ -0,0 +1,33 @@
+Test to make sure padding shorthand property returns CSSValueList properly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS computedStyle.getPropertyValue('padding') is '10px 5px 4px 3px'
+PASS computedStyle.getPropertyCSSValue('padding').toString() is '[object CSSValueList]'
+PASS computedStyle.getPropertyCSSValue('padding').length is 4
+PASS computedStyle.getPropertyCSSValue('padding').cssText is '10px 5px 4px 3px'
+PASS computedStyle.getPropertyCSSValue('padding').item(0).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 10
+PASS computedStyle.getPropertyCSSValue('padding').item(1).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 5
+PASS computedStyle.getPropertyCSSValue('padding').item(2).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 4
+PASS computedStyle.getPropertyCSSValue('padding').item(3).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 3
+PASS computedStyle.getPropertyValue('padding') is '64px 80px 96px 112px'
+PASS computedStyle.getPropertyCSSValue('padding').toString() is '[object CSSValueList]'
+PASS computedStyle.getPropertyCSSValue('padding').length is 4
+PASS computedStyle.getPropertyCSSValue('padding').cssText is '64px 80px 96px 112px'
+PASS computedStyle.getPropertyCSSValue('padding').item(0).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 64
+PASS computedStyle.getPropertyCSSValue('padding').item(1).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 80
+PASS computedStyle.getPropertyCSSValue('padding').item(2).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 96
+PASS computedStyle.getPropertyCSSValue('padding').item(3).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 112
+PASS computedStyle.getPropertyValue('padding') is '5px 6px 7px 8px'
+PASS computedStyle.getPropertyCSSValue('padding').toString() is '[object CSSValueList]'
+PASS computedStyle.getPropertyCSSValue('padding').length is 4
+PASS computedStyle.getPropertyCSSValue('padding').cssText is '5px 6px 7px 8px'
+PASS computedStyle.getPropertyCSSValue('padding').item(0).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 5
+PASS computedStyle.getPropertyCSSValue('padding').item(1).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 6
+PASS computedStyle.getPropertyCSSValue('padding').item(2).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 7
+PASS computedStyle.getPropertyCSSValue('padding').item(3).getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 8
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html
new file mode 100644 (file)
index 0000000..ff4452f
--- /dev/null
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+
+description("Test to make sure padding shorthand property returns CSSValueList properly.")
+
+var testContainer = document.createElement("div");
+testContainer.contentEditable = true;
+document.body.appendChild(testContainer);
+
+testContainer.innerHTML = '<div style="width:100px;height:100px"><div id="test">hello</div></div>';
+
+e = document.getElementById('test');
+computedStyle = window.getComputedStyle(e, null);
+
+e.style.padding = "10px 5px 4px 3px";
+shouldBe("computedStyle.getPropertyValue('padding')", "'10px 5px 4px 3px'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').toString()", "'[object CSSValueList]'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').length", "4");
+shouldBe("computedStyle.getPropertyCSSValue('padding').cssText", "'10px 5px 4px 3px'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(0).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "10");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(1).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "5");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(2).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "4");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(3).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "3");
+
+e.style.padding = "4em 5em 6em 7em";
+shouldBe("computedStyle.getPropertyValue('padding')", "'64px 80px 96px 112px'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').toString()", "'[object CSSValueList]'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').length", "4");
+shouldBe("computedStyle.getPropertyCSSValue('padding').cssText", "'64px 80px 96px 112px'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(0).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "64");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(1).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "80");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(2).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "96");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(3).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "112");
+
+e.style.padding = "5% 6% 7% 8%";
+shouldBe("computedStyle.getPropertyValue('padding')", "'5px 6px 7px 8px'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').toString()", "'[object CSSValueList]'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').length", "4");
+shouldBe("computedStyle.getPropertyCSSValue('padding').cssText", "'5px 6px 7px 8px'");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(0).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "5");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(1).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "6");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(2).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "7");
+shouldBe("computedStyle.getPropertyCSSValue('padding').item(3).getFloatValue(CSSPrimitiveValue.CSS_NUMBER)", "8");
+
+document.body.removeChild(testContainer);
+
+</script>
+<script src="../../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 632d9a6..026208d 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-12-29  Alexis Menard  <alexis.menard@openbossa.org>
+
+        getComputedStyle for padding is not implemented.
+        https://bugs.webkit.org/show_bug.cgi?id=75352
+
+        Reviewed by Andreas Kling.
+
+        Implement getComputedStyle for padding shorthand property.
+
+        Test: fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+
 2011-12-29  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 
         Use HashMap<OwnPtr> in OriginAccessMap
diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
index 3fc7b89..21704e1 100644 (file)
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -2180,9 +2180,12 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         case CSSPropertyListStyle:
         case CSSPropertyMargin:
         case CSSPropertyOutline:
-        case CSSPropertyPadding:
             break;
-
+        case CSSPropertyPadding: {
+            const int properties[4] = { CSSPropertyPaddingTop, CSSPropertyPaddingRight,
+                                        CSSPropertyPaddingBottom, CSSPropertyPaddingLeft };
+            return getCSSPropertyValuesForShorthandProperties(properties, WTF_ARRAY_LENGTH(properties));
+        }
         /* Individual properties not part of the spec */
         case CSSPropertyBackgroundRepeatX:
         case CSSPropertyBackgroundRepeatY:
Mirror of the WebKit open source project on svn.webkit.org.