Changeset 154336 in webkit for trunk/Source/JavaScriptCore/runtime/Lookup.h

Timestamp:

Aug 20, 2013, 10:09:03 AM (12 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=120054
Remove some dead code following getOwnPropertyDescriptor cleanup

Reviewed by Oliver Hunt.

../JavaScriptCore:

• runtime/Lookup.h:

(JSC::getStaticFunctionSlot):

• remove getStaticPropertyDescriptor, getStaticFunctionDescriptor, getStaticValueDescriptor.

../WebCore:

• bindings/js/JSPluginElementFunctions.cpp:
• bindings/js/JSPluginElementFunctions.h:
  • remove runtimeObjectCustomGetOwnPropertyDescriptor, pluginElementCustomGetOwnPropertyDescriptor

File:

• trunk/Source/JavaScriptCore/runtime/Lookup.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/Lookup.h

@@ -256 +256 @@
     }
 
-    template <class ThisImp, class ParentImp>
-    inline bool getStaticPropertyDescriptor(ExecState* exec, const HashTable* table, ThisImp* thisObj, PropertyName propertyName, PropertyDescriptor& descriptor)
-    {
-        const HashEntry* entry = table->entry(exec, propertyName);
-        
-        if (!entry) // not found, forward to parent
-            return ParentImp::getOwnPropertyDescriptor(thisObj, exec, propertyName, descriptor);
- 
-        PropertySlot slot(thisObj);
-        if (entry->attributes() & Function) {
-            bool present = setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot);
-            if (present)
-                descriptor.setDescriptor(slot.getValue(exec, propertyName), entry->attributes());
-            return present;
-        }
-
-        slot.setCustom(thisObj, entry->attributes(), entry->propertyGetter());
-        descriptor.setDescriptor(slot.getValue(exec, propertyName), entry->attributes());
-        return true;
-    }
-
     /**
      * Simplified version of getStaticPropertySlot in case there are only functions.
@@ -294 +273 @@
         return setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot);
     }
-    
-    /**
-     * Simplified version of getStaticPropertyDescriptor in case there are only functions.
-     * Using this instead of getStaticPropertyDescriptor allows 'this' to avoid implementing
-     * a dummy getValueProperty.
-     */
-    template <class ParentImp>
-    inline bool getStaticFunctionDescriptor(ExecState* exec, const HashTable* table, JSObject* thisObj, PropertyName propertyName, PropertyDescriptor& descriptor)
-    {
-        if (ParentImp::getOwnPropertyDescriptor(static_cast<ParentImp*>(thisObj), exec, propertyName, descriptor))
-            return true;
-        
-        const HashEntry* entry = table->entry(exec, propertyName);
-        if (!entry)
-            return false;
-        
-        PropertySlot slot(thisObj);
-        bool present = setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot);
-        if (present)
-            descriptor.setDescriptor(slot.getValue(exec, propertyName), entry->attributes());
-        return present;
-    }
 
     /**
@@ -332 +289 @@
 
         slot.setCacheableCustom(thisObj, entry->attributes(), entry->propertyGetter());
-        return true;
-    }
-
-    /**
-     * Simplified version of getStaticPropertyDescriptor in case there are no functions, only "values".
-     * Using this instead of getStaticPropertyDescriptor removes the need for a FuncImp class.
-     */
-    template <class ThisImp, class ParentImp>
-    inline bool getStaticValueDescriptor(ExecState* exec, const HashTable* table, ThisImp* thisObj, PropertyName propertyName, PropertyDescriptor& descriptor)
-    {
-        const HashEntry* entry = table->entry(exec, propertyName);
-        
-        if (!entry) // not found, forward to parent
-            return ParentImp::getOwnPropertyDescriptor(thisObj, exec, propertyName, descriptor);
-        
-        ASSERT(!(entry->attributes() & Function));
-        PropertySlot slot(thisObj);
-        slot.setCustom(thisObj, entry->attributes(), entry->propertyGetter());
-        descriptor.setDescriptor(slot.getValue(exec, propertyName), entry->attributes());
         return true;
     }