[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
inferno at chromium.org
inferno at chromium.org
Wed Dec 22 14:53:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fb55e7a5725b11b1ed0e2405780dac7e36f345b7
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 23 00:03:17 2010 +0000
2010-10-22 Abhishek Arya <inferno at chromium.org>
Unreviewed.
Fix test fail in chromium. Addition to commit already done in bug 48160.
* fast/css/modify-ua-rules-from-javascript-expected.txt:
* fast/css/modify-ua-rules-from-javascript.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70370 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7573561..69c8e84 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-22 Abhishek Arya <inferno at chromium.org>
+
+ Unreviewed.
+
+ Fix test fail in chromium. Addition to commit already done in bug 48160.
+
+ * fast/css/modify-ua-rules-from-javascript-expected.txt:
+ * fast/css/modify-ua-rules-from-javascript.html:
+
2010-10-20 Anders Carlsson <andersca at apple.com>
Reviewed by Adam Barth and Darin Adler.
diff --git a/LayoutTests/fast/css/modify-ua-rules-from-javascript-expected.txt b/LayoutTests/fast/css/modify-ua-rules-from-javascript-expected.txt
index 5eeb8d3..7ef22e9 100644
--- a/LayoutTests/fast/css/modify-ua-rules-from-javascript-expected.txt
+++ b/LayoutTests/fast/css/modify-ua-rules-from-javascript-expected.txt
@@ -1,2 +1 @@
-CONSOLE MESSAGE: line 11: TypeError: Result of expression 'window.getMatchedCSSRules(document.body, "", false)' [null] is not an object.
PASS
diff --git a/LayoutTests/fast/css/modify-ua-rules-from-javascript.html b/LayoutTests/fast/css/modify-ua-rules-from-javascript.html
index 2a6d11a..2cbfea4 100644
--- a/LayoutTests/fast/css/modify-ua-rules-from-javascript.html
+++ b/LayoutTests/fast/css/modify-ua-rules-from-javascript.html
@@ -8,10 +8,10 @@ if (window.layoutTestController)
function test()
{
- var cssRulesList = window.getMatchedCSSRules(document.body, "", false)[0];
+ var cssRulesList = window.getMatchedCSSRules(document.body, "", false);
if (cssRulesList)
{
- var styleToChange = cssRulesList.style;
+ var styleToChange = cssRulesList[0].style;
var originalMarginTop = styleToChange.marginTop;
styleToChange.marginTop = "200px";
styleToChange.marginTop = originalMarginTop;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list