Changeset 107544 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

Timestamp:

Feb 13, 2012, 1:28:44 AM (14 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=78434
Unreviewed - temporarily reverting r107498 will I fix a couple of testcases.

Source/JavaScriptCore:

• parser/Parser.cpp:

(JSC::::parseFunctionInfo):

• runtime/ClassInfo.h:

(MethodTable):
(JSC):

• runtime/JSCell.cpp:

(JSC):

• runtime/JSCell.h:

(JSCell):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC):

• runtime/JSGlobalObjectFunctions.h:

(JSC):

• runtime/JSObject.cpp:

(JSC::JSObject::put):
(JSC):
(JSC::JSObject::putDirectAccessor):
(JSC::JSObject::defineOwnProperty):

• runtime/JSObject.h:

(JSC::JSObject::inlineGetOwnPropertySlot):
(JSC::JSValue::get):

• runtime/JSString.cpp:

(JSC::JSString::getOwnPropertySlot):

• runtime/JSValue.h:

(JSValue):

• runtime/ObjectConstructor.cpp:

(JSC::objectConstructorGetPrototypeOf):

• runtime/Structure.cpp:

(JSC::Structure::Structure):

• runtime/Structure.h:

(JSC::Structure::setHasGetterSetterProperties):
(Structure):

Source/WebCore:

• bindings/js/JSDOMWindowBase.cpp:

(WebCore):

• bindings/js/JSDOMWindowBase.h:

(JSDOMWindowBase):

LayoutTests:

• fast/js/Object-getOwnPropertyNames-expected.txt:
• fast/js/cyclic-prototypes-expected.txt:
• fast/js/parser-syntax-check-expected.txt:
• fast/js/preventExtensions-expected.txt:
• fast/js/prototypes-expected.txt:
• fast/js/script-tests/Object-getOwnPropertyNames.js:
• fast/js/script-tests/cyclic-prototypes.js:
• fast/js/script-tests/parser-syntax-check.js:
• fast/js/script-tests/preventExtensions.js:
• fast/js/script-tests/prototypes.js:

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -715 +715 @@
 }
 
-EncodedJSValue JSC_HOST_CALL globalFuncProtoGetter(ExecState* exec)
-{
-    if (!exec->thisValue().isObject())
-        return JSValue::encode(exec->thisValue().synthesizePrototype(exec));
-
-    JSObject* thisObject = asObject(exec->thisValue());
-    if (!thisObject->methodTable()->allowsAccessFrom(thisObject, exec))
-        return JSValue::encode(jsUndefined());
-
-    return JSValue::encode(thisObject->prototype());
-}
-
-EncodedJSValue JSC_HOST_CALL globalFuncProtoSetter(ExecState* exec)
-{
-    JSValue value = exec->argument(0);
-
-    // Setting __proto__ of a primitive should have no effect.
-    if (!exec->thisValue().isObject())
-        return JSValue::encode(jsUndefined());
-
-    JSObject* thisObject = asObject(exec->thisValue());
-    if (!thisObject->methodTable()->allowsAccessFrom(thisObject, exec))
-        return JSValue::encode(jsUndefined());
-
-    // Setting __proto__ to a non-object, non-null value is silently ignored to match Mozilla.
-    if (!value.isObject() && !value.isNull())
-        return JSValue::encode(jsUndefined());
-
-    if (!thisObject->isExtensible())
-        return JSValue::encode(jsUndefined());
-
-    if (!thisObject->setPrototypeWithCycleCheck(exec->globalData(), value))
-        throwError(exec, createError(exec, "cyclic __proto__ value"));
-
-    return JSValue::encode(jsUndefined());
-}
-
 } // namespace JSC