[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:11 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 13f6a39037f7dc94e41a736b8b93c828b2aba4e5
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 22 23:18:40 2010 +0000
2010-10-22 Abhishek Arya <inferno at chromium.org>
Reviewed by Dimitri Glazkov.
Fix failing tests on chromium.
https://bugs.webkit.org/show_bug.cgi?id=48160
* fast/backgrounds/repeat/background-repeat-shorthand-expected.txt:
* fast/backgrounds/repeat/margin-shorthand-expected.txt:
* fast/backgrounds/repeat/resources/background-repeat-shorthand.js:
(getShorthand):
* fast/backgrounds/repeat/resources/margin-shorthand.js:
(iconMarginValue):
* fast/css/modify-ua-rules-from-javascript.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70363 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0c40e6e..0d35906 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-22 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Fix failing tests on chromium.
+ https://bugs.webkit.org/show_bug.cgi?id=48160
+
+ * fast/backgrounds/repeat/background-repeat-shorthand-expected.txt:
+ * fast/backgrounds/repeat/margin-shorthand-expected.txt:
+ * fast/backgrounds/repeat/resources/background-repeat-shorthand.js:
+ (getShorthand):
+ * fast/backgrounds/repeat/resources/margin-shorthand.js:
+ (iconMarginValue):
+ * fast/css/modify-ua-rules-from-javascript.html:
+
2010-10-22 Dimitri Glazkov <dglazkov at chromium.org>
Update layout test expectations after r70335.
diff --git a/LayoutTests/fast/backgrounds/repeat/background-repeat-shorthand-expected.txt b/LayoutTests/fast/backgrounds/repeat/background-repeat-shorthand-expected.txt
index 2f9764b..54eb998 100644
--- a/LayoutTests/fast/backgrounds/repeat/background-repeat-shorthand-expected.txt
+++ b/LayoutTests/fast/backgrounds/repeat/background-repeat-shorthand-expected.txt
@@ -3,30 +3,30 @@ This layout test used to test that correct shorthand name is returned for backgr
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS getShorthand("background-repeat-x", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-repeat-y", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-repeat", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-position-x", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-position-y", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-position", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-repeat-x", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-repeat-y", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-repeat", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-position-x", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-position-y", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-repeat", "icon1") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-repeat-x", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-repeat-y", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-repeat", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-position-x", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-position-y", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("background-position", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-repeat-x", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-repeat-y", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-repeat", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-position-x", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-position-y", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
-PASS getShorthand("-webkit-mask-repeat", "icon2") threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
+PASS getShorthand("background-repeat-x", "icon1") is "null"
+PASS getShorthand("background-repeat-y", "icon1") is "null"
+PASS getShorthand("background-repeat", "icon1") is "null"
+PASS getShorthand("background-position-x", "icon1") is "null"
+PASS getShorthand("background-position-y", "icon1") is "null"
+PASS getShorthand("background-position", "icon1") is "null"
+PASS getShorthand("-webkit-mask-repeat-x", "icon1") is "null"
+PASS getShorthand("-webkit-mask-repeat-y", "icon1") is "null"
+PASS getShorthand("-webkit-mask-repeat", "icon1") is "null"
+PASS getShorthand("-webkit-mask-position-x", "icon1") is "null"
+PASS getShorthand("-webkit-mask-position-y", "icon1") is "null"
+PASS getShorthand("-webkit-mask-repeat", "icon1") is "null"
+PASS getShorthand("background-repeat-x", "icon2") is "null"
+PASS getShorthand("background-repeat-y", "icon2") is "null"
+PASS getShorthand("background-repeat", "icon2") is "null"
+PASS getShorthand("background-position-x", "icon2") is "null"
+PASS getShorthand("background-position-y", "icon2") is "null"
+PASS getShorthand("background-position", "icon2") is "null"
+PASS getShorthand("-webkit-mask-repeat-x", "icon2") is "null"
+PASS getShorthand("-webkit-mask-repeat-y", "icon2") is "null"
+PASS getShorthand("-webkit-mask-repeat", "icon2") is "null"
+PASS getShorthand("-webkit-mask-position-x", "icon2") is "null"
+PASS getShorthand("-webkit-mask-position-y", "icon2") is "null"
+PASS getShorthand("-webkit-mask-repeat", "icon2") is "null"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/backgrounds/repeat/margin-shorthand-expected.txt b/LayoutTests/fast/backgrounds/repeat/margin-shorthand-expected.txt
index 70e34dd..4303fbb 100644
--- a/LayoutTests/fast/backgrounds/repeat/margin-shorthand-expected.txt
+++ b/LayoutTests/fast/backgrounds/repeat/margin-shorthand-expected.txt
@@ -3,7 +3,7 @@ This layouttest was initially there to test that shorthand property value is cor
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS iconMarginValue() threw exception TypeError: Result of expression 'rules[1]' [undefined] is not an object..
+PASS iconMarginValue() is "null"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/backgrounds/repeat/resources/background-repeat-shorthand.js b/LayoutTests/fast/backgrounds/repeat/resources/background-repeat-shorthand.js
index 897bef5..fd1bb38 100644
--- a/LayoutTests/fast/backgrounds/repeat/resources/background-repeat-shorthand.js
+++ b/LayoutTests/fast/backgrounds/repeat/resources/background-repeat-shorthand.js
@@ -12,41 +12,41 @@ function getShorthand(longhand, iconId)
{
var iconDiv = document.getElementById(iconId);
var rules = window.getMatchedCSSRules(iconDiv,'',false);
- return rules[1].style.getPropertyShorthand(longhand);
+ return rules[1] ? rules[1].style.getPropertyShorthand(longhand) : 'null';
}
-shouldThrow('getShorthand("background-repeat-x", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("background-repeat-y", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("background-repeat", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('getShorthand("background-repeat-x", "icon1")', '"null"');
+shouldBe('getShorthand("background-repeat-y", "icon1")', '"null"');
+shouldBe('getShorthand("background-repeat", "icon1")', '"null"');
-shouldThrow('getShorthand("background-position-x", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("background-position-y", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("background-position", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('getShorthand("background-position-x", "icon1")', '"null"');
+shouldBe('getShorthand("background-position-y", "icon1")', '"null"');
+shouldBe('getShorthand("background-position", "icon1")', '"null"');
-shouldThrow('getShorthand("-webkit-mask-repeat-x", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("-webkit-mask-repeat-y", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("-webkit-mask-repeat", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('getShorthand("-webkit-mask-repeat-x", "icon1")', '"null"');
+shouldBe('getShorthand("-webkit-mask-repeat-y", "icon1")', '"null"');
+shouldBe('getShorthand("-webkit-mask-repeat", "icon1")', '"null"');
-shouldThrow('getShorthand("-webkit-mask-position-x", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("-webkit-mask-position-y", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("-webkit-mask-repeat", "icon1")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('getShorthand("-webkit-mask-position-x", "icon1")', '"null"');
+shouldBe('getShorthand("-webkit-mask-position-y", "icon1")', '"null"');
+shouldBe('getShorthand("-webkit-mask-repeat", "icon1")', '"null"');
-shouldThrow('getShorthand("background-repeat-x", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("background-repeat-y", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("background-repeat", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('getShorthand("background-repeat-x", "icon2")', '"null"');
+shouldBe('getShorthand("background-repeat-y", "icon2")', '"null"');
+shouldBe('getShorthand("background-repeat", "icon2")', '"null"');
-shouldThrow('getShorthand("background-position-x", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("background-position-y", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("background-position", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('getShorthand("background-position-x", "icon2")', '"null"');
+shouldBe('getShorthand("background-position-y", "icon2")', '"null"');
+shouldBe('getShorthand("background-position", "icon2")', '"null"');
-shouldThrow('getShorthand("-webkit-mask-repeat-x", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("-webkit-mask-repeat-y", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("-webkit-mask-repeat", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('getShorthand("-webkit-mask-repeat-x", "icon2")', '"null"');
+shouldBe('getShorthand("-webkit-mask-repeat-y", "icon2")', '"null"');
+shouldBe('getShorthand("-webkit-mask-repeat", "icon2")', '"null"');
-shouldThrow('getShorthand("-webkit-mask-position-x", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("-webkit-mask-position-y", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
-shouldThrow('getShorthand("-webkit-mask-repeat", "icon2")', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('getShorthand("-webkit-mask-position-x", "icon2")', '"null"');
+shouldBe('getShorthand("-webkit-mask-position-y", "icon2")', '"null"');
+shouldBe('getShorthand("-webkit-mask-repeat", "icon2")', '"null"');
var successfullyParsed = true;
diff --git a/LayoutTests/fast/backgrounds/repeat/resources/margin-shorthand.js b/LayoutTests/fast/backgrounds/repeat/resources/margin-shorthand.js
index 5907829..022fde6 100644
--- a/LayoutTests/fast/backgrounds/repeat/resources/margin-shorthand.js
+++ b/LayoutTests/fast/backgrounds/repeat/resources/margin-shorthand.js
@@ -10,9 +10,9 @@ function iconMarginValue()
{
var iconDiv = document.getElementById('icon');
var rules = window.getMatchedCSSRules(iconDiv,'',false);
- return rules[1].style.getPropertyValue('margin');
+ return rules[1] ? rules[1].style.getPropertyValue('margin') : 'null';
}
-shouldThrow('iconMarginValue()', '"TypeError: Result of expression \'rules[1]\' [undefined] is not an object."');
+shouldBe('iconMarginValue()', '"null"');
var successfullyParsed = true;
diff --git a/LayoutTests/fast/css/modify-ua-rules-from-javascript.html b/LayoutTests/fast/css/modify-ua-rules-from-javascript.html
index dd2e784..2a6d11a 100644
--- a/LayoutTests/fast/css/modify-ua-rules-from-javascript.html
+++ b/LayoutTests/fast/css/modify-ua-rules-from-javascript.html
@@ -8,12 +8,15 @@ if (window.layoutTestController)
function test()
{
- var styleToChange = window.getMatchedCSSRules(document.body, "", false)[0].style;
- var originalMarginTop = styleToChange.marginTop;
- styleToChange.marginTop = "200px";
- styleToChange.marginTop = originalMarginTop;
-
- document.getElementById("result").innerHTML = "FAIL";
+ var cssRulesList = window.getMatchedCSSRules(document.body, "", false)[0];
+ if (cssRulesList)
+ {
+ var styleToChange = cssRulesList.style;
+ var originalMarginTop = styleToChange.marginTop;
+ styleToChange.marginTop = "200px";
+ styleToChange.marginTop = originalMarginTop;
+ document.getElementById("result").innerHTML = "FAIL";
+ }
}
</script>
</head>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list