[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:24:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 297118fb8015d1b7fd1c28a687d3e218bb28b873
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 8 00:16:12 2010 +0000
2010-10-07 James Kozianski <koz at chromium.org>
Reviewed by Adam Barth.
getPropertyValue('border') is incorrect after border-top-width is set
https://bugs.webkit.org/show_bug.cgi?id=45949
CSSMutableStyleDeclaration::getCommonValue() was ignoring values from
properties that were implicitly set, which led to erroneous results
from getPropertyValue().
* fast/dom/css-shorthand-common-value-expected.txt: Added.
* fast/dom/css-shorthand-common-value.html: Added.
2010-10-07 James Kozianski <koz at chromium.org>
Reviewed by Adam Barth.
getPropertyValue('border') is incorrect after border-top-width is set
https://bugs.webkit.org/show_bug.cgi?id=45949
Test: fast/dom/css-shorthand-common-value.html
CSSMutableStyleDeclaration::getCommonValue() was ignoring values from
properties that were implicitly set, which led to erroneous results
from getPropertyValue().
* css/CSSMutableStyleDeclaration.cpp:
(WebCore::CSSMutableStyleDeclaration::getCommonValue):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69357 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 50bb626..42fc2d6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-07 James Kozianski <koz at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ getPropertyValue('border') is incorrect after border-top-width is set
+ https://bugs.webkit.org/show_bug.cgi?id=45949
+
+ CSSMutableStyleDeclaration::getCommonValue() was ignoring values from
+ properties that were implicitly set, which led to erroneous results
+ from getPropertyValue().
+
+
+ * fast/dom/css-shorthand-common-value-expected.txt: Added.
+ * fast/dom/css-shorthand-common-value.html: Added.
+
2010-10-07 Martin Robinson <mrobinson at igalia.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/LayoutTests/fast/dom/css-shorthand-common-value-expected.txt b/LayoutTests/fast/dom/css-shorthand-common-value-expected.txt
new file mode 100644
index 0000000..5b20ddb
--- /dev/null
+++ b/LayoutTests/fast/dom/css-shorthand-common-value-expected.txt
@@ -0,0 +1,3 @@
+getPropertyValue('border') should not return a value for any property that doesn't have the same value for top, left, right and bottom, even if the values that differ are implicitly set by a shorthand.
+
+PASS
diff --git a/LayoutTests/fast/dom/css-shorthand-common-value.html b/LayoutTests/fast/dom/css-shorthand-common-value.html
new file mode 100644
index 0000000..17b9dde
--- /dev/null
+++ b/LayoutTests/fast/dom/css-shorthand-common-value.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<style>
+#test {
+ border: 10px solid red;
+ border-top-width: 50px;
+}
+</style>
+<p>getPropertyValue('border') should not return a value for any property that doesn't have the same value for top, left, right and bottom, even if the values that differ are implicitly set by a shorthand.
+<pre id="result">
+</pre>
+
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ var sheet = document.querySelector('style').sheet;
+ var expected = 'solid red';
+ var actual = sheet.cssRules[0].style.getPropertyValue('border');
+
+if (expected == actual)
+ document.getElementById('result').innerText = 'PASS';
+else
+ document.getElementById('result').innerText = 'FAIL: expected "' + expected + '", got "' + actual + '"';
+
+</script>
+
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7a148ad..f802d98 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-07 James Kozianski <koz at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ getPropertyValue('border') is incorrect after border-top-width is set
+ https://bugs.webkit.org/show_bug.cgi?id=45949
+
+ Test: fast/dom/css-shorthand-common-value.html
+
+ CSSMutableStyleDeclaration::getCommonValue() was ignoring values from
+ properties that were implicitly set, which led to erroneous results
+ from getPropertyValue().
+
+ * css/CSSMutableStyleDeclaration.cpp:
+ (WebCore::CSSMutableStyleDeclaration::getCommonValue):
+
2010-10-07 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Tony Chang.
diff --git a/WebCore/css/CSSMutableStyleDeclaration.cpp b/WebCore/css/CSSMutableStyleDeclaration.cpp
index b1b7805..9b1dd71 100644
--- a/WebCore/css/CSSMutableStyleDeclaration.cpp
+++ b/WebCore/css/CSSMutableStyleDeclaration.cpp
@@ -410,18 +410,16 @@ String CSSMutableStyleDeclaration::getCommonValue(const int* properties, int num
{
String res;
for (int i = 0; i < number; ++i) {
- if (!isPropertyImplicit(properties[i])) {
- RefPtr<CSSValue> value = getPropertyCSSValue(properties[i]);
- if (!value)
- return String();
- String text = value->cssText();
- if (text.isNull())
- return String();
- if (res.isNull())
- res = text;
- else if (res != text)
- return String();
- }
+ RefPtr<CSSValue> value = getPropertyCSSValue(properties[i]);
+ if (!value)
+ return String();
+ String text = value->cssText();
+ if (text.isNull())
+ return String();
+ if (res.isNull())
+ res = text;
+ else if (res != text)
+ return String();
}
return res;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list