From 715be629d51174233403237bfc563cf150087dc8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 25 Sep 2012 13:02:02 +0200 Subject: Imported WebKit commit ce614b0924ba46f78d4435e28ff93c8525fbb7cc (http://svn.webkit.org/repository/webkit/trunk@129485) New snapshot that includes MingW build fixes --- Source/JavaScriptCore/runtime/JSObject.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSObject.cpp') diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp index acff8a6ae..7bf12b67e 100644 --- a/Source/JavaScriptCore/runtime/JSObject.cpp +++ b/Source/JavaScriptCore/runtime/JSObject.cpp @@ -601,7 +601,7 @@ Structure* JSObject::inheritorID(JSGlobalData& globalData) bool JSObject::allowsAccessFrom(ExecState* exec) { - JSGlobalObject* globalObject = unwrappedGlobalObject(); + JSGlobalObject* globalObject = this->globalObject(); return globalObject->globalObjectMethodTable()->allowsAccessFrom(globalObject, exec); } @@ -924,13 +924,6 @@ JSObject* JSObject::toThisObject(JSCell* cell, ExecState*) return jsCast(cell); } -JSObject* JSObject::unwrappedObject() -{ - if (isGlobalThis()) - return jsCast(this)->unwrappedObject(); - return this; -} - void JSObject::seal(JSGlobalData& globalData) { if (isSealed(globalData)) @@ -954,13 +947,6 @@ void JSObject::preventExtensions(JSGlobalData& globalData) setStructure(globalData, Structure::preventExtensionsTransition(globalData, structure())); } -JSGlobalObject* JSObject::unwrappedGlobalObject() -{ - if (isGlobalThis()) - return jsCast(this)->unwrappedObject(); - return structure()->globalObject(); -} - // This presently will flatten to an uncachable dictionary; this is suitable // for use in delete, we may want to do something different elsewhere. void JSObject::reifyStaticFunctionsForDelete(ExecState* exec) @@ -1052,7 +1038,7 @@ void JSObject::notifyUsedAsPrototype(JSGlobalData& globalData) Structure* JSObject::createInheritorID(JSGlobalData& globalData) { - Structure* inheritorID = createEmptyObjectStructure(globalData, unwrappedGlobalObject(), this); + Structure* inheritorID = createEmptyObjectStructure(globalData, globalObject(), this); ASSERT(inheritorID->isEmpty()); PutPropertySlot slot; -- cgit v1.2.1