Diff
Modified: trunk/LayoutTests/ChangeLog (88314 => 88315)
--- trunk/LayoutTests/ChangeLog 2011-06-08 02:06:16 UTC (rev 88314)
+++ trunk/LayoutTests/ChangeLog 2011-06-08 02:09:12 UTC (rev 88315)
@@ -1,3 +1,13 @@
+2011-06-07 Gavin Barraclough <barraclo...@apple.com>
+
+ Reviewed by Sam Weinig.
+
+ https://bugs.webkit.org/show_bug.cgi?id=55537
+ Functions claim to have 'callee' which they actually don't (and shouldn't)
+
+ * fast/js/Object-getOwnPropertyNames-expected.txt:
+ * fast/js/script-tests/Object-getOwnPropertyNames.js:
+
2011-06-07 James Kozianski <k...@chromium.org>
[Chromium] Unreviewed. Update expectations for tests that are timing out.
Modified: trunk/LayoutTests/fast/js/Object-getOwnPropertyNames-expected.txt (88314 => 88315)
--- trunk/LayoutTests/fast/js/Object-getOwnPropertyNames-expected.txt 2011-06-08 02:06:16 UTC (rev 88314)
+++ trunk/LayoutTests/fast/js/Object-getOwnPropertyNames-expected.txt 2011-06-08 02:09:12 UTC (rev 88315)
@@ -11,8 +11,8 @@
PASS getSortedOwnPropertyNames({__proto__:[1,2,3]}) is []
PASS getSortedOwnPropertyNames(Object.create({}, { 'a': { 'value': 1, 'enumerable': false } })) is ['a']
PASS getSortedOwnPropertyNames(Object.create([1,2,3], { 'a': { 'value': 1, 'enumerable': false } })) is ['a']
-PASS getSortedOwnPropertyNames(new Function()) is ['arguments', 'callee', 'caller', 'length', 'name', 'prototype']
-PASS getSortedOwnPropertyNames((function(){var x=new Function();x.__proto__=[1,2,3];return x;})()) is ['arguments', 'callee', 'caller', 'length', 'name', 'prototype']
+PASS getSortedOwnPropertyNames(new Function()) is ['arguments', 'caller', 'length', 'name', 'prototype']
+PASS getSortedOwnPropertyNames((function(){var x=new Function();x.__proto__=[1,2,3];return x;})()) is ['arguments', 'caller', 'length', 'name', 'prototype']
PASS getSortedOwnPropertyNames(new String('')) is ['length']
PASS getSortedOwnPropertyNames(new String('a')) is ['0', 'length']
PASS getSortedOwnPropertyNames(new String('abc')) is ['0', '1', '2', 'length']
Modified: trunk/LayoutTests/fast/js/script-tests/Object-getOwnPropertyNames.js (88314 => 88315)
--- trunk/LayoutTests/fast/js/script-tests/Object-getOwnPropertyNames.js 2011-06-08 02:06:16 UTC (rev 88314)
+++ trunk/LayoutTests/fast/js/script-tests/Object-getOwnPropertyNames.js 2011-06-08 02:09:12 UTC (rev 88315)
@@ -12,8 +12,8 @@
"Object.create({}, { 'a': { 'value': 1, 'enumerable': false } })": "['a']",
"Object.create([1,2,3], { 'a': { 'value': 1, 'enumerable': false } })": "['a']",
// Function objects
- "new Function()": "['arguments', 'callee', 'caller', 'length', 'name', 'prototype']",
- "(function(){var x=new Function();x.__proto__=[1,2,3];return x;})()": "['arguments', 'callee', 'caller', 'length', 'name', 'prototype']",
+ "new Function()": "['arguments', 'caller', 'length', 'name', 'prototype']",
+ "(function(){var x=new Function();x.__proto__=[1,2,3];return x;})()": "['arguments', 'caller', 'length', 'name', 'prototype']",
// String objects
"new String('')": "['length']",
"new String('a')": "['0', 'length']",
Modified: trunk/Source/_javascript_Core/ChangeLog (88314 => 88315)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-08 02:06:16 UTC (rev 88314)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-08 02:09:12 UTC (rev 88315)
@@ -1,3 +1,14 @@
+2011-06-07 Gavin Barraclough <barraclo...@apple.com>
+
+ Reviewed by Sam Weinig
+
+ https://bugs.webkit.org/show_bug.cgi?id=55537
+ Functions claim to have 'callee' which they actually don't (and shouldn't)
+
+ * _javascript_Core.xcodeproj/project.pbxproj:
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::getOwnPropertyNames):
+
2011-06-07 Juan C. Montemayor <jm...@apple.com>
Reviewed by Darin Adler.
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (88314 => 88315)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2011-06-08 02:06:16 UTC (rev 88314)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2011-06-08 02:09:12 UTC (rev 88315)
@@ -786,7 +786,6 @@
1482B78A0A4305AB00517CFC /* APICast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APICast.h; sourceTree = "<group>"; };
1482B7E10A43076000517CFC /* JSObjectRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSObjectRef.h; sourceTree = "<group>"; };
1482B7E20A43076000517CFC /* JSObjectRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSObjectRef.cpp; sourceTree = "<group>"; };
- 1483B589099BC1950016E4F0 /* JSImmediate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSImmediate.h; sourceTree = "<group>"; };
148A1626095D16BB00666D0D /* ListRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ListRefPtr.h; sourceTree = "<group>"; };
148A1ECD0D10C23B0069A47C /* RefPtrHashMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefPtrHashMap.h; sourceTree = "<group>"; };
148CD1D7108CF902008163C6 /* JSContextRefPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSContextRefPrivate.h; sourceTree = "<group>"; };
@@ -1890,7 +1889,6 @@
A8E894330CD0603F00367179 /* JSGlobalObject.h */,
BC756FC60E2031B200DE7D12 /* JSGlobalObjectFunctions.cpp */,
BC756FC70E2031B200DE7D12 /* JSGlobalObjectFunctions.h */,
- 1483B589099BC1950016E4F0 /* JSImmediate.h */,
65EA4C99092AF9E20093D800 /* JSLock.cpp */,
65EA4C9A092AF9E20093D800 /* JSLock.h */,
A72700780DAC605600E548D7 /* JSNotAnObject.cpp */,
Modified: trunk/Source/_javascript_Core/runtime/JSFunction.cpp (88314 => 88315)
--- trunk/Source/_javascript_Core/runtime/JSFunction.cpp 2011-06-08 02:06:16 UTC (rev 88314)
+++ trunk/Source/_javascript_Core/runtime/JSFunction.cpp 2011-06-08 02:09:12 UTC (rev 88315)
@@ -280,7 +280,6 @@
getOwnPropertySlot(exec, exec->propertyNames().prototype, slot);
propertyNames.add(exec->propertyNames().arguments);
- propertyNames.add(exec->propertyNames().callee);
propertyNames.add(exec->propertyNames().caller);
propertyNames.add(exec->propertyNames().length);
}
