Changeset 96446 in webkit


Ignore:
Timestamp:
Sep 30, 2011 6:29:34 PM (13 years ago)
Author:
barraclough@apple.com
Message:

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:
Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r96443 r96446  
     12011-09-30  Gavin Barraclough  <barraclough@apple.com>
     2
     3        Remove toStrictThisObject, toThisString, toThisJSString
     4        https://bugs.webkit.org/show_bug.cgi?id=69203
     5
     6        Rubber stamped by Sam Weinig
     7
     8        These are no longer used.
     9
     10        * JavaScriptCore.exp:
     11        * runtime/JSActivation.cpp:
     12        * runtime/JSActivation.h:
     13        * runtime/JSObject.cpp:
     14        * runtime/JSObject.h:
     15        * runtime/JSStaticScopeObject.cpp:
     16        * runtime/JSStaticScopeObject.h:
     17        * runtime/JSValue.h:
     18        * runtime/StrictEvalActivation.cpp:
     19        * runtime/StrictEvalActivation.h:
     20
    1212011-09-30  Filip Pizlo  <fpizlo@apple.com>
    222

  • trunk/Source/JavaScriptCore/JavaScriptCore.exp

    r96406 r96446  
    573573__ZNK3JSC8JSObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE
    574574__ZNK3JSC8JSObject12toThisObjectEPNS_9ExecStateE
    575 __ZNK3JSC8JSObject18toStrictThisObjectEPNS_9ExecStateE
    576575__ZNK3JSC8JSObject8toNumberEPNS_9ExecStateE
    577576__ZNK3JSC8JSObject8toStringEPNS_9ExecStateE

  • trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

    r96346 r96446  
    207207}
    208208
    209 JSValue JSActivation::toStrictThisObject(ExecState*) const
    210 {
    211     return jsNull();
    212 }
    213    
    214209bool JSActivation::isDynamicScope(bool& requiresDynamicChecks) const
    215210{

  • trunk/Source/JavaScriptCore/runtime/JSActivation.h

    r96346 r96446  
    7171
    7272        virtual JSObject* toThisObject(ExecState*) const;
    73         virtual JSValue toStrictThisObject(ExecState*) const;
    7473
    7574        void copyRegisters(JSGlobalData&);

  • trunk/Source/JavaScriptCore/runtime/JSObject.cpp

    r96381 r96446  
    514514
    515515JSObject* JSObject::toThisObject(ExecState*) const
    516 {
    517     return const_cast<JSObject*>(this);
    518 }
    519 
    520 JSValue JSObject::toStrictThisObject(ExecState*) const
    521516{
    522517    return const_cast<JSObject*>(this);

  • trunk/Source/JavaScriptCore/runtime/JSObject.h

    r96381 r96446  
    139139
    140140        virtual JSObject* toThisObject(ExecState*) const;
    141         virtual JSValue toStrictThisObject(ExecState*) const;
    142141        virtual JSObject* unwrappedObject();
    143142
    … …  
    831830// --- JSValue inlines ----------------------------
    832831
    833 ALWAYS_INLINE UString JSValue::toThisString(ExecState* exec) const
    834 {
    835     return isString() ? static_cast<JSString*>(asCell())->value(exec) : toThisObject(exec)->toString(exec);
    836 }
    837 
    838 inline JSString* JSValue::toThisJSString(ExecState* exec) const
    839 {
    840     return isString() ? static_cast<JSString*>(asCell()) : jsString(exec, toThisObject(exec)->toString(exec));
    841 }
    842 
    843 inline JSValue JSValue::toStrictThisObject(ExecState* exec) const
    844 {
    845     if (!isObject())
    846         return *this;
    847     return asObject(asCell())->toStrictThisObject(exec);
    848 }
    849 
    850832ALWAYS_INLINE JSObject* Register::function() const
    851833{

  • trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.cpp

    r96346 r96446  
    4848}
    4949
    50 JSValue JSStaticScopeObject::toStrictThisObject(ExecState*) const
    51 {
    52     return jsNull();
    53 }
    54 
    5550void JSStaticScopeObject::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
    5651{

  • trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.h

    r96346 r96446  
    4545        bool isDynamicScope(bool& requiresDynamicChecks) const;
    4646        virtual JSObject* toThisObject(ExecState*) const;
    47         virtual JSValue toStrictThisObject(ExecState*) const;
    4847        virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
    4948        virtual void put(ExecState*, const Identifier&, JSValue, PutPropertySlot&);

  • trunk/Source/JavaScriptCore/runtime/JSValue.h

    r96346 r96446  
    218218
    219219        JSObject* toThisObject(ExecState*) const;
    220         JSValue toStrictThisObject(ExecState*) const;
    221         UString toThisString(ExecState*) const;
    222         JSString* toThisJSString(ExecState*) const;
    223220
    224221        static bool equal(ExecState* exec, JSValue v1, JSValue v2);

  • trunk/Source/JavaScriptCore/runtime/StrictEvalActivation.cpp

    r95901 r96446  
    4444}
    4545
    46 JSValue StrictEvalActivation::toStrictThisObject(ExecState*) const
    47 {
    48     return jsNull();
    4946}
    50 
    51 }

  • trunk/Source/JavaScriptCore/runtime/StrictEvalActivation.h

    r95901 r96446  
    4444    virtual bool deleteProperty(ExecState*, const Identifier&);
    4545    virtual JSObject* toThisObject(ExecState*) const;
    46     virtual JSValue toStrictThisObject(ExecState*) const;
    4746
    4847    static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype)

  • trunk/Source/WebCore/ChangeLog

    r96445 r96446  
     12011-09-30  Gavin Barraclough  <barraclough@apple.com>
     2
     3        Remove toStrictThisObject, toThisString, toThisJSString
     4        https://bugs.webkit.org/show_bug.cgi?id=69203
     5
     6        Rubber stamped by Sam Weinig
     7
     8        These are no longer used.
     9
     10        * bindings/js/JSDOMWindowBase.cpp:
     11        * bindings/js/JSDOMWindowBase.h:
     12
    1132011-09-30  Adam Barth  <abarth@webkit.org>
    214

  • trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

    r95936 r96446  
    151151}
    152152
    153 JSValue JSDOMWindowBase::toStrictThisObject(ExecState*) const
    154 {
    155     return shell();
    156 }
    157 
    158153JSDOMWindowShell* JSDOMWindowBase::shell() const
    159154{

  • trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h

    r95108 r96446  
    7070       
    7171        virtual JSC::JSObject* toThisObject(JSC::ExecState*) const;
    72         virtual JSC::JSValue toStrictThisObject(JSC::ExecState*) const;
    7372        JSDOMWindowShell* shell() const;
    7473
Note: See TracChangeset for help on using the changeset viewer.