Changeset 38268 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 10, 2008, 12:25:35 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-10 Cameron Zwarich <​[email protected]>

Reviewed by Geoff Garen.

Bug 22162: Remove cachedValueGetter from the JavaScriptCore API implementation
<​https://bugs.webkit.org/show_bug.cgi?id=22162>

There is no more need for the cachedValueGetter hack now that we have
PropertySlot::setValue(), so we should remove it.

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h: (JSC::::getOwnPropertySlot):

Location:

trunk/JavaScriptCore

Files:

• API/JSCallbackObject.h (modified) (1 diff)
• API/JSCallbackObjectFunctions.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/JavaScriptCore/API/JSCallbackObject.h

@@ -83 +83 @@
     static JSObject* construct(ExecState*, JSObject* constructor, const ArgList&);
    
-    static JSValue* cachedValueGetter(ExecState*, const Identifier&, const PropertySlot&);
     static JSValue* staticValueGetter(ExecState*, const Identifier&, const PropertySlot&);
     static JSValue* staticFunctionGetter(ExecState*, const Identifier&, const PropertySlot&);

trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -128 +128 @@
             JSLock::DropAllLocks dropAllLocks(exec);
             if (JSValueRef value = getProperty(ctx, thisRef, propertyNameRef.get(), toRef(exec->exceptionSlot()))) {
-                // cache the value so we don't have to compute it again
-                // FIXME: This violates the PropertySlot design a little bit.
-                // We should either use this optimization everywhere, or nowhere.
-                slot.setCustom(toJS(value), cachedValueGetter);
+                slot.setValue(toJS(value));
                 return true;
             }
@@ -431 +428 @@
 
 template <class Base>
-JSValue* JSCallbackObject<Base>::cachedValueGetter(ExecState*, const Identifier&, const PropertySlot& slot)
-{
-    JSValue* v = slot.slotBase();
-    ASSERT(v);
-    return v;
-}
-
-template <class Base>
 JSValue* JSCallbackObject<Base>::staticValueGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
 {

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-10  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        Bug 22162: Remove cachedValueGetter from the JavaScriptCore API implementation
+        <https://bugs.webkit.org/show_bug.cgi?id=22162>
+
+        There is no more need for the cachedValueGetter hack now that we have
+        PropertySlot::setValue(), so we should remove it.
+
+        * API/JSCallbackObject.h:
+        * API/JSCallbackObjectFunctions.h:
+        (JSC::::getOwnPropertySlot):
+
 2008-11-10  Cameron Zwarich  <[email protected]>