Changeset 33980 in webkit


Ignore:
Timestamp:
May 21, 2008 6:21:18 PM (16 years ago)
Author:
mrowe@apple.com
Message:

2008-05-21 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Mark Rowe.

Fix layout test failure in fast/dom/getter-on-window-object2 introduced in r33961.

  • JavaScriptCore.exp:
  • kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::defineGetter): (KJS::JSGlobalObject::defineSetter):
  • kjs/JSGlobalObject.h:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r33979 r33980  
     12008-05-21  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Fix layout test failure in fast/dom/getter-on-window-object2 introduced in r33961.
     6
     7        * JavaScriptCore.exp:
     8        * kjs/JSGlobalObject.cpp:
     9        (KJS::JSGlobalObject::defineGetter):
     10        (KJS::JSGlobalObject::defineSetter):
     11        * kjs/JSGlobalObject.h:
     12
    113=== End merge of squirrelfish ===
    214

  • trunk/JavaScriptCore/JavaScriptCore.exp

    r33979 r33980  
    113113__ZN3KJS13jsOwnedStringERKNS_7UStringE
    114114__ZN3KJS14JSGlobalObject10globalExecEv
     115__ZN3KJS14JSGlobalObject12defineGetterEPNS_9ExecStateERKNS_10IdentifierEPNS_8JSObjectE
     116__ZN3KJS14JSGlobalObject12defineSetterEPNS_9ExecStateERKNS_10IdentifierEPNS_8JSObjectE
    115117__ZN3KJS14JSGlobalObject16stopTimeoutCheckEv
    116118__ZN3KJS14JSGlobalObject17putWithAttributesEPNS_9ExecStateERKNS_10IdentifierEPNS_7JSValueEj
    … …  
    199201__ZN3KJS8JSObject9constructEPNS_9ExecStateERKNS_4ListE
    200202__ZN3KJS8JSObject9constructEPNS_9ExecStateERKNS_4ListERKNS_10IdentifierERKNS_7UStringEi
     203__ZN3KJS8Profiler13stopProfilingEPNS_9ExecStateERKNS_7UStringE
     204__ZN3KJS8Profiler14startProfilingEPNS_9ExecStateERKNS_7UStringE
    201205__ZN3KJS8Profiler8profilerEv
    202206__ZN3KJS8jsStringEPKc
    … …  
    208212__ZN3KJS9Collector23collectOnMainThreadOnlyEPNS_7JSValueE
    209213__ZN3KJS9Collector25protectedObjectTypeCountsEv
    210 __ZN3KJS8Profiler13stopProfilingEPNS_9ExecStateERKNS_7UStringE
    211 __ZN3KJS8Profiler14startProfilingEPNS_9ExecStateERKNS_7UStringE
    212214__ZN3KJS9Collector26protectedGlobalObjectCountEv
    213215__ZN3KJS9Collector4sizeEv

  • trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

    r33979 r33980  
    235235}
    236236
     237void JSGlobalObject::defineGetter(ExecState* exec, const Identifier& propertyName, JSObject* getterFunc)
     238{
     239    PropertySlot slot;
     240    if (!symbolTableGet(propertyName, slot))
     241        JSVariableObject::defineGetter(exec, propertyName, getterFunc);
     242}
     243
     244void JSGlobalObject::defineSetter(ExecState* exec, const Identifier& propertyName, JSObject* setterFunc)
     245{
     246    PropertySlot slot;
     247    if (!symbolTableGet(propertyName, slot))
     248        JSVariableObject::defineSetter(exec, propertyName, setterFunc);
     249}
     250
    237251static inline JSObject* lastInPrototypeChain(JSObject* object)
    238252{

  • trunk/JavaScriptCore/kjs/JSGlobalObject.h

    r33979 r33980  
    172172        virtual void putWithAttributes(ExecState*, const Identifier& propertyName, JSValue* value, unsigned attributes);
    173173
     174
     175        virtual void defineGetter(ExecState*, const Identifier& propertyName, JSObject* getterFunc);
     176        virtual void defineSetter(ExecState*, const Identifier& propertyName, JSObject* setterFunc);
     177
    174178        // Linked list of all global objects.
    175179        static JSGlobalObject* head() { return s_head; }

  • trunk/LayoutTests/ChangeLog

    r33979 r33980  
     12008-05-21  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Update results.
     6
     7        * fast/dom/getter-on-window-object2-expected.txt:
     8
    19=== End merge of squirrelfish ===
    210

  • trunk/LayoutTests/fast/dom/getter-on-window-object2-expected.txt

    r30635 r33980  
    22
    33window.x is: 1
    4 typeof window.__lookupGetter__("x") is: function
     4typeof window.__lookupGetter__("x") is: undefined
    55window.x is: 2
    6 typeof window.__lookupSetter__("x") is: function
     6typeof window.__lookupSetter__("x") is: undefined
    77window.y is: window.y __getter__
    88typeof window.__lookupGetter__("y") is: function
Note: See TracChangeset for help on using the changeset viewer.