Commit 4d5e46b5 authored by barraclough@apple.com's avatar barraclough@apple.com

Remove toStrictThisObject, toThisString, toThisJSString

https://bugs.webkit.org/show_bug.cgi?id=69203

Rubber stamped by Sam Weinig

These are no longer used.

../JavaScriptCore: 

* JavaScriptCore.exp:
* runtime/JSActivation.cpp:
* runtime/JSActivation.h:
* runtime/JSObject.cpp:
* runtime/JSObject.h:
* runtime/JSStaticScopeObject.cpp:
* runtime/JSStaticScopeObject.h:
* runtime/JSValue.h:
* runtime/StrictEvalActivation.cpp:
* runtime/StrictEvalActivation.h:

../WebCore: 

* bindings/js/JSDOMWindowBase.cpp:
* bindings/js/JSDOMWindowBase.h:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 808b1ca0
2011-09-30 Gavin Barraclough <barraclough@apple.com>
Remove toStrictThisObject, toThisString, toThisJSString
https://bugs.webkit.org/show_bug.cgi?id=69203
Rubber stamped by Sam Weinig
These are no longer used.
* JavaScriptCore.exp:
* runtime/JSActivation.cpp:
* runtime/JSActivation.h:
* runtime/JSObject.cpp:
* runtime/JSObject.h:
* runtime/JSStaticScopeObject.cpp:
* runtime/JSStaticScopeObject.h:
* runtime/JSValue.h:
* runtime/StrictEvalActivation.cpp:
* runtime/StrictEvalActivation.h:
2011-09-30 Filip Pizlo <fpizlo@apple.com>
DFG does not speculate aggressively enough on put_by_id
......@@ -572,7 +572,6 @@ __ZNK3JSC8JSObject11hasPropertyEPNS_9ExecStateERKNS_10IdentifierE
__ZNK3JSC8JSObject11hasPropertyEPNS_9ExecStateEj
__ZNK3JSC8JSObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE
__ZNK3JSC8JSObject12toThisObjectEPNS_9ExecStateE
__ZNK3JSC8JSObject18toStrictThisObjectEPNS_9ExecStateE
__ZNK3JSC8JSObject8toNumberEPNS_9ExecStateE
__ZNK3JSC8JSObject8toStringEPNS_9ExecStateE
__ZNK3JSC8JSObject9classNameEv
......
......@@ -206,11 +206,6 @@ JSObject* JSActivation::toThisObject(ExecState* exec) const
return exec->globalThisValue();
}
JSValue JSActivation::toStrictThisObject(ExecState*) const
{
return jsNull();
}
bool JSActivation::isDynamicScope(bool& requiresDynamicChecks) const
{
requiresDynamicChecks = m_requiresDynamicChecks;
......
......@@ -70,7 +70,6 @@ namespace JSC {
virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
virtual JSObject* toThisObject(ExecState*) const;
virtual JSValue toStrictThisObject(ExecState*) const;
void copyRegisters(JSGlobalData&);
......
......@@ -517,11 +517,6 @@ JSObject* JSObject::toThisObject(ExecState*) const
return const_cast<JSObject*>(this);
}
JSValue JSObject::toStrictThisObject(ExecState*) const
{
return const_cast<JSObject*>(this);
}
JSObject* JSObject::unwrappedObject()
{
return this;
......
......@@ -138,7 +138,6 @@ namespace JSC {
virtual UString toString(ExecState*) const;
virtual JSObject* toThisObject(ExecState*) const;
virtual JSValue toStrictThisObject(ExecState*) const;
virtual JSObject* unwrappedObject();
bool getPropertySpecificValue(ExecState* exec, const Identifier& propertyName, JSCell*& specificFunction) const;
......@@ -830,23 +829,6 @@ ALWAYS_INLINE void JSObject::visitChildrenDirect(SlotVisitor& visitor)
// --- JSValue inlines ----------------------------
ALWAYS_INLINE UString JSValue::toThisString(ExecState* exec) const
{
return isString() ? static_cast<JSString*>(asCell())->value(exec) : toThisObject(exec)->toString(exec);
}
inline JSString* JSValue::toThisJSString(ExecState* exec) const
{
return isString() ? static_cast<JSString*>(asCell()) : jsString(exec, toThisObject(exec)->toString(exec));
}
inline JSValue JSValue::toStrictThisObject(ExecState* exec) const
{
if (!isObject())
return *this;
return asObject(asCell())->toStrictThisObject(exec);
}
ALWAYS_INLINE JSObject* Register::function() const
{
if (!jsValue())
......
......@@ -47,11 +47,6 @@ JSObject* JSStaticScopeObject::toThisObject(ExecState* exec) const
return exec->globalThisValue();
}
JSValue JSStaticScopeObject::toStrictThisObject(ExecState*) const
{
return jsNull();
}
void JSStaticScopeObject::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
{
if (slot.isStrictMode()) {
......
......@@ -44,7 +44,6 @@ namespace JSC{
static void visitChildren(JSCell*, SlotVisitor&);
bool isDynamicScope(bool& requiresDynamicChecks) const;
virtual JSObject* toThisObject(ExecState*) const;
virtual JSValue toStrictThisObject(ExecState*) const;
virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
virtual void put(ExecState*, const Identifier&, JSValue, PutPropertySlot&);
void putWithAttributes(ExecState*, const Identifier&, JSValue, unsigned attributes);
......
......@@ -217,9 +217,6 @@ namespace JSC {
void put(ExecState*, unsigned propertyName, JSValue);
JSObject* toThisObject(ExecState*) const;
JSValue toStrictThisObject(ExecState*) const;
UString toThisString(ExecState*) const;
JSString* toThisJSString(ExecState*) const;
static bool equal(ExecState* exec, JSValue v1, JSValue v2);
static bool equalSlowCase(ExecState* exec, JSValue v1, JSValue v2);
......
......@@ -43,9 +43,4 @@ JSObject* StrictEvalActivation::toThisObject(ExecState* exec) const
return exec->globalThisValue();
}
JSValue StrictEvalActivation::toStrictThisObject(ExecState*) const
{
return jsNull();
}
}
......@@ -43,7 +43,6 @@ public:
virtual bool deleteProperty(ExecState*, const Identifier&);
virtual JSObject* toThisObject(ExecState*) const;
virtual JSValue toStrictThisObject(ExecState*) const;
static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype)
{
......
2011-09-30 Gavin Barraclough <barraclough@apple.com>
Remove toStrictThisObject, toThisString, toThisJSString
https://bugs.webkit.org/show_bug.cgi?id=69203
Rubber stamped by Sam Weinig
These are no longer used.
* bindings/js/JSDOMWindowBase.cpp:
* bindings/js/JSDOMWindowBase.h:
2011-09-30 Adam Barth <abarth@webkit.org>
Remove ASSERT introduced in http://trac.webkit.org/changeset/96427
......@@ -150,11 +150,6 @@ JSObject* JSDOMWindowBase::toThisObject(ExecState*) const
return shell();
}
JSValue JSDOMWindowBase::toStrictThisObject(ExecState*) const
{
return shell();
}
JSDOMWindowShell* JSDOMWindowBase::shell() const
{
return m_shell;
......
......@@ -69,7 +69,6 @@ namespace WebCore {
virtual bool allowsAccessFrom(const JSC::JSGlobalObject*) const;
virtual JSC::JSObject* toThisObject(JSC::ExecState*) const;
virtual JSC::JSValue toStrictThisObject(JSC::ExecState*) const;
JSDOMWindowShell* shell() const;
static JSC::JSGlobalData* commonJSGlobalData();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment