Changeset 154337 in webkit for trunk/Source/JavaScriptCore/runtime/PropertySlot.h

Timestamp:

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

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=120067
Remove getPropertyDescriptor

Reviewed by Oliver Hunt.

This is used by lookupGetter/lookupSetter - this can easily bee replaced by getPropertySlot.
Since we'll be getting the GetterSetter from the slot in the setter case, rename isGetter() to isAccessor().

• runtime/JSObject.cpp:
• runtime/JSObject.h:
  • remove getPropertyDescriptor
• runtime/ObjectPrototype.cpp:

(JSC::objectProtoFuncLookupGetter):
(JSC::objectProtoFuncLookupSetter):

• replace call to getPropertyDescriptor with getPropertySlot

• runtime/PropertyDescriptor.h:
• runtime/PropertySlot.h:

(JSC::PropertySlot::isAccessor):
(JSC::PropertySlot::isCacheableGetter):
(JSC::PropertySlot::getterSetter):

• rename isGetter() to isAccessor()

File:

• trunk/Source/JavaScriptCore/runtime/PropertySlot.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/PropertySlot.h

@@ -70 +70 @@
     bool isCacheable() const { return m_offset != invalidOffset; }
     bool isValue() const { return m_propertyType == TypeValue; }
-    bool isGetter() const { return m_propertyType == TypeGetter; }
+    bool isAccessor() const { return m_propertyType == TypeGetter; }
     bool isCustom() const { return m_propertyType == TypeCustom; }
     bool isCacheableValue() const { return isCacheable() && isValue(); }
-    bool isCacheableGetter() const { return isCacheable() && isGetter(); }
+    bool isCacheableGetter() const { return isCacheable() && isAccessor(); }
     bool isCacheableCustom() const { return isCacheable() && isCustom(); }
 
@@ -86 +86 @@
     GetterSetter* getterSetter() const
     {
-        ASSERT(isGetter());
+        ASSERT(isAccessor());
         return m_data.getter.getterSetter;
     }