[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
abarth at webkit.org
abarth at webkit.org
Fri Jan 21 15:03:24 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit f0d5ceb8f6344729faf21d38d60034cbc7f46693
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 6 20:28:58 2011 +0000
2011-01-06 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
prototype-inheritance prints FAIL when it shouldn't
https://bugs.webkit.org/show_bug.cgi?id=52007
Before this patch, we were testing the prototypes of primitive values,
but the rules for primitive values are different than the rules for
objects. Primitive values get their prototypes from the current
lexical scope when they get boxed. This test is designed to test that
objects get their prototypes from their original holder.
In this patch, we skip testing non-object/non-functions. We can add
another test for primitives if we think that would be valuable.
* fast/dom/prototype-inheritance-expected.txt:
* fast/dom/script-tests/prototype-inheritance.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75177 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0560fc6..da2019a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2011-01-06 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ prototype-inheritance prints FAIL when it shouldn't
+ https://bugs.webkit.org/show_bug.cgi?id=52007
+
+ Before this patch, we were testing the prototypes of primitive values,
+ but the rules for primitive values are different than the rules for
+ objects. Primitive values get their prototypes from the current
+ lexical scope when they get boxed. This test is designed to test that
+ objects get their prototypes from their original holder.
+
+ In this patch, we skip testing non-object/non-functions. We can add
+ another test for primitives if we think that would be valuable.
+
+ * fast/dom/prototype-inheritance-expected.txt:
+ * fast/dom/script-tests/prototype-inheritance.js:
+
2011-01-06 James Robinson <jamesr at chromium.org>
Update expectations for tests that enumerate properties on the window to reflect newly added property.
diff --git a/LayoutTests/fast/dom/prototype-inheritance-expected.txt b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
index 4e54032..8c903b4 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
@@ -247,8 +247,6 @@ PASS inner.Image.isInner is true
PASS inner.Image.constructor.isInner is true
PASS inner.ImageData.isInner is true
PASS inner.ImageData.constructor.isInner is true
-FAIL inner.Infinity.isInner should be true. Was false.
-FAIL inner.Infinity.constructor.isInner should be true. Was false.
PASS inner.JSON.isInner is true
PASS inner.JSON.constructor.isInner is true
PASS inner.KeyboardEvent.isInner is true
@@ -273,8 +271,6 @@ PASS inner.MouseEvent.isInner is true
PASS inner.MouseEvent.constructor.isInner is true
PASS inner.MutationEvent.isInner is true
PASS inner.MutationEvent.constructor.isInner is true
-FAIL inner.NaN.isInner should be true. Was false.
-FAIL inner.NaN.constructor.isInner should be true. Was false.
PASS inner.NamedNodeMap.isInner is true
PASS inner.NamedNodeMap.constructor.isInner is true
PASS inner.Node.isInner is true
@@ -675,8 +671,6 @@ PASS inner.clientInformation.isInner is true
PASS inner.clientInformation.constructor.isInner is true
PASS inner.close.isInner is true
PASS inner.close.constructor.isInner is true
-FAIL inner.closed.isInner should be true. Was false.
-FAIL inner.closed.constructor.isInner should be true. Was false.
PASS inner.confirm.isInner is true
PASS inner.confirm.constructor.isInner is true
PASS inner.console.isInner is true
@@ -685,12 +679,6 @@ PASS inner.decodeURI.isInner is true
PASS inner.decodeURI.constructor.isInner is true
PASS inner.decodeURIComponent.isInner is true
PASS inner.decodeURIComponent.constructor.isInner is true
-FAIL inner.defaultStatus.isInner should be true. Was false.
-FAIL inner.defaultStatus.constructor.isInner should be true. Was false.
-FAIL inner.defaultstatus.isInner should be true. Was false.
-FAIL inner.defaultstatus.constructor.isInner should be true. Was false.
-FAIL inner.devicePixelRatio.isInner should be true. Was false.
-FAIL inner.devicePixelRatio.constructor.isInner should be true. Was false.
PASS inner.dispatchEvent.isInner is true
PASS inner.dispatchEvent.constructor.isInner is true
PASS inner.document.isInner is true
@@ -719,18 +707,10 @@ PASS inner.getSelection.isInner is true
PASS inner.getSelection.constructor.isInner is true
PASS inner.history.isInner is true
PASS inner.history.constructor.isInner is true
-FAIL inner.innerHeight.isInner should be true. Was false.
-FAIL inner.innerHeight.constructor.isInner should be true. Was false.
-FAIL inner.innerWidth.isInner should be true. Was false.
-FAIL inner.innerWidth.constructor.isInner should be true. Was false.
PASS inner.isFinite.isInner is true
PASS inner.isFinite.constructor.isInner is true
-FAIL inner.isInner.isInner should be true. Was false.
-FAIL inner.isInner.constructor.isInner should be true. Was false.
PASS inner.isNaN.isInner is true
PASS inner.isNaN.constructor.isInner is true
-FAIL inner.length.isInner should be true. Was false.
-FAIL inner.length.constructor.isInner should be true. Was false.
PASS inner.localStorage.isInner is true
PASS inner.localStorage.constructor.isInner is true
PASS inner.location.isInner is true
@@ -745,24 +725,12 @@ PASS inner.moveBy.isInner is true
PASS inner.moveBy.constructor.isInner is true
PASS inner.moveTo.isInner is true
PASS inner.moveTo.constructor.isInner is true
-FAIL inner.name.isInner should be true. Was false.
-FAIL inner.name.constructor.isInner should be true. Was false.
PASS inner.navigator.isInner is true
PASS inner.navigator.constructor.isInner is true
-FAIL inner.offscreenBuffering.isInner should be true. Was false.
-FAIL inner.offscreenBuffering.constructor.isInner should be true. Was false.
PASS inner.open.isInner is true
PASS inner.open.constructor.isInner is true
PASS inner.openDatabase.isInner is true
PASS inner.openDatabase.constructor.isInner is true
-FAIL inner.outerHeight.isInner should be true. Was false.
-FAIL inner.outerHeight.constructor.isInner should be true. Was false.
-FAIL inner.outerWidth.isInner should be true. Was false.
-FAIL inner.outerWidth.constructor.isInner should be true. Was false.
-FAIL inner.pageXOffset.isInner should be true. Was false.
-FAIL inner.pageXOffset.constructor.isInner should be true. Was false.
-FAIL inner.pageYOffset.isInner should be true. Was false.
-FAIL inner.pageYOffset.constructor.isInner should be true. Was false.
PASS inner.parseFloat.isInner is true
PASS inner.parseFloat.constructor.isInner is true
PASS inner.parseInt.isInner is true
@@ -785,24 +753,12 @@ PASS inner.resizeTo.isInner is true
PASS inner.resizeTo.constructor.isInner is true
PASS inner.screen.isInner is true
PASS inner.screen.constructor.isInner is true
-FAIL inner.screenLeft.isInner should be true. Was false.
-FAIL inner.screenLeft.constructor.isInner should be true. Was false.
-FAIL inner.screenTop.isInner should be true. Was false.
-FAIL inner.screenTop.constructor.isInner should be true. Was false.
-FAIL inner.screenX.isInner should be true. Was false.
-FAIL inner.screenX.constructor.isInner should be true. Was false.
-FAIL inner.screenY.isInner should be true. Was false.
-FAIL inner.screenY.constructor.isInner should be true. Was false.
PASS inner.scroll.isInner is true
PASS inner.scroll.constructor.isInner is true
PASS inner.scrollBy.isInner is true
PASS inner.scrollBy.constructor.isInner is true
PASS inner.scrollTo.isInner is true
PASS inner.scrollTo.constructor.isInner is true
-FAIL inner.scrollX.isInner should be true. Was false.
-FAIL inner.scrollX.constructor.isInner should be true. Was false.
-FAIL inner.scrollY.isInner should be true. Was false.
-FAIL inner.scrollY.constructor.isInner should be true. Was false.
PASS inner.scrollbars.isInner is true
PASS inner.scrollbars.constructor.isInner is true
PASS inner.self.isInner is true
@@ -813,8 +769,6 @@ PASS inner.setInterval.isInner is true
PASS inner.setInterval.constructor.isInner is true
PASS inner.setTimeout.isInner is true
PASS inner.setTimeout.constructor.isInner is true
-FAIL inner.status.isInner should be true. Was false.
-FAIL inner.status.constructor.isInner should be true. Was false.
PASS inner.statusbar.isInner is true
PASS inner.statusbar.constructor.isInner is true
PASS inner.stop.isInner is true
diff --git a/LayoutTests/fast/dom/script-tests/prototype-inheritance.js b/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
index 3afc7a9..921aa34 100644
--- a/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
+++ b/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
@@ -66,6 +66,9 @@ for (var x = 0; x < windowProperites.length; x++) {
// Skip enumerable properties which default to null (like on* listeners)
if (value === null)
continue;
+ // Ignore primitive types like numbers because their prototype rules are different.
+ if (typeof value !== "object" && typeof value !== "function")
+ continue;
shouldBeTrue("inner." + property + ".isInner");
shouldBeTrue("inner." + property + ".constructor.isInner");
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list