Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96445 => 96446)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-01 01:29:34 UTC (rev 96446)
@@ -1,3 +1,23 @@
+2011-09-30 Gavin Barraclough <barraclo...@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.
+
+ * _javascript_Core.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 <fpi...@apple.com>
DFG does not speculate aggressively enough on put_by_id
Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (96445 => 96446)
--- trunk/Source/_javascript_Core/_javascript_Core.exp 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/_javascript_Core.exp 2011-10-01 01:29:34 UTC (rev 96446)
@@ -572,7 +572,6 @@
__ZNK3JSC8JSObject11hasPropertyEPNS_9ExecStateEj
__ZNK3JSC8JSObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE
__ZNK3JSC8JSObject12toThisObjectEPNS_9ExecStateE
-__ZNK3JSC8JSObject18toStrictThisObjectEPNS_9ExecStateE
__ZNK3JSC8JSObject8toNumberEPNS_9ExecStateE
__ZNK3JSC8JSObject8toStringEPNS_9ExecStateE
__ZNK3JSC8JSObject9classNameEv
Modified: trunk/Source/_javascript_Core/runtime/JSActivation.cpp (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/JSActivation.cpp 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSActivation.cpp 2011-10-01 01:29:34 UTC (rev 96446)
@@ -206,11 +206,6 @@
return exec->globalThisValue();
}
-JSValue JSActivation::toStrictThisObject(ExecState*) const
-{
- return jsNull();
-}
-
bool JSActivation::isDynamicScope(bool& requiresDynamicChecks) const
{
requiresDynamicChecks = m_requiresDynamicChecks;
Modified: trunk/Source/_javascript_Core/runtime/JSActivation.h (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/JSActivation.h 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSActivation.h 2011-10-01 01:29:34 UTC (rev 96446)
@@ -70,7 +70,6 @@
virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
virtual JSObject* toThisObject(ExecState*) const;
- virtual JSValue toStrictThisObject(ExecState*) const;
void copyRegisters(JSGlobalData&);
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2011-10-01 01:29:34 UTC (rev 96446)
@@ -517,11 +517,6 @@
return const_cast<JSObject*>(this);
}
-JSValue JSObject::toStrictThisObject(ExecState*) const
-{
- return const_cast<JSObject*>(this);
-}
-
JSObject* JSObject::unwrappedObject()
{
return this;
Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/JSObject.h 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h 2011-10-01 01:29:34 UTC (rev 96446)
@@ -138,7 +138,6 @@
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 @@
// --- 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())
Modified: trunk/Source/_javascript_Core/runtime/JSStaticScopeObject.cpp (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/JSStaticScopeObject.cpp 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSStaticScopeObject.cpp 2011-10-01 01:29:34 UTC (rev 96446)
@@ -47,11 +47,6 @@
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()) {
Modified: trunk/Source/_javascript_Core/runtime/JSStaticScopeObject.h (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/JSStaticScopeObject.h 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSStaticScopeObject.h 2011-10-01 01:29:34 UTC (rev 96446)
@@ -44,7 +44,6 @@
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);
Modified: trunk/Source/_javascript_Core/runtime/JSValue.h (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/JSValue.h 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSValue.h 2011-10-01 01:29:34 UTC (rev 96446)
@@ -217,9 +217,6 @@
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);
Modified: trunk/Source/_javascript_Core/runtime/StrictEvalActivation.cpp (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/StrictEvalActivation.cpp 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/StrictEvalActivation.cpp 2011-10-01 01:29:34 UTC (rev 96446)
@@ -43,9 +43,4 @@
return exec->globalThisValue();
}
-JSValue StrictEvalActivation::toStrictThisObject(ExecState*) const
-{
- return jsNull();
}
-
-}
Modified: trunk/Source/_javascript_Core/runtime/StrictEvalActivation.h (96445 => 96446)
--- trunk/Source/_javascript_Core/runtime/StrictEvalActivation.h 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/StrictEvalActivation.h 2011-10-01 01:29:34 UTC (rev 96446)
@@ -43,7 +43,6 @@
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)
{
Modified: trunk/Source/WebCore/ChangeLog (96445 => 96446)
--- trunk/Source/WebCore/ChangeLog 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/WebCore/ChangeLog 2011-10-01 01:29:34 UTC (rev 96446)
@@ -1,3 +1,15 @@
+2011-09-30 Gavin Barraclough <barraclo...@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 <aba...@webkit.org>
Remove ASSERT introduced in http://trac.webkit.org/changeset/96427
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (96445 => 96446)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2011-10-01 01:29:34 UTC (rev 96446)
@@ -150,11 +150,6 @@
return shell();
}
-JSValue JSDOMWindowBase::toStrictThisObject(ExecState*) const
-{
- return shell();
-}
-
JSDOMWindowShell* JSDOMWindowBase::shell() const
{
return m_shell;
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h (96445 => 96446)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2011-10-01 01:29:34 UTC (rev 96446)
@@ -69,7 +69,6 @@
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();
