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

Timestamp:

Dec 23, 2013, 4:11:25 PM (11 years ago)

Author:

[email protected]

Message:

Refactor PutPropertySlot to be aware of custom properties
​https://bugs.webkit.org/show_bug.cgi?id=126187

Reviewed by msaboff.

Source/JavaScriptCore:

Refactor PutPropertySlot, making the constructor take the thisValue
used as a target. This results in a wide range of boilerplate changes
to pass the new parameter.

• API/JSObjectRef.cpp:

(JSObjectSetProperty):

• dfg/DFGOperations.cpp:

(JSC::DFG::operationPutByValInternal):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::execute):

• jit/JITOperations.cpp:
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• runtime/Arguments.cpp:

(JSC::Arguments::putByIndex):

• runtime/ArrayPrototype.cpp:

(JSC::putProperty):
(JSC::arrayProtoFuncPush):

• runtime/JSCJSValue.cpp:

(JSC::JSValue::putToPrimitiveByIndex):

• runtime/JSCell.cpp:

(JSC::JSCell::putByIndex):

• runtime/JSFunction.cpp:

(JSC::JSFunction::put):

• runtime/JSGenericTypedArrayViewInlines.h:

(JSC::JSGenericTypedArrayView<Adaptor>::putByIndex):

• runtime/JSONObject.cpp:

(JSC::Walker::walk):

• runtime/JSObject.cpp:

(JSC::JSObject::putByIndex):
(JSC::JSObject::putDirectNonIndexAccessor):
(JSC::JSObject::deleteProperty):

• runtime/JSObject.h:

(JSC::JSObject::putDirect):

• runtime/Lookup.h:

(JSC::putEntry):
(JSC::lookupPut):

• runtime/PutPropertySlot.h:

(JSC::PutPropertySlot::PutPropertySlot):
(JSC::PutPropertySlot::setCustomProperty):
(JSC::PutPropertySlot::thisValue):
(JSC::PutPropertySlot::isCacheable):

Source/WebCore:

Update the bindings code generation and custom objects
to the new function signatures

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::put):

• bindings/objc/WebScriptObject.mm:

(-[WebScriptObject setValue:forKey:]):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

• bindings/scripts/test/JS/JSTestInterface.cpp:

(WebCore::JSTestInterface::putByIndex):

• bridge/NP_jsobject.cpp:

(_NPN_SetProperty):

Source/WebKit/mac:

Update for new method signatures.

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::setProperty):

Source/WebKit2:

Update for new method signatures.

• WebProcess/Plugins/Netscape/NPJSObject.cpp:

(WebKit::NPJSObject::setProperty):

File:

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

trunk/Source/JavaScriptCore/runtime/Lookup.h

@@ -27 +27 @@
 #include "JSGlobalObject.h"
 #include "PropertySlot.h"
+#include "PutPropertySlot.h"
 #include <wtf/Assertions.h>
 
@@ -42 +43 @@
     // ie. typedef JSValue (*GetFunction)(ExecState*, JSObject* baseObject)
     typedef PropertySlot::GetValueFunc GetFunction;
-    typedef void (*PutFunction)(ExecState*, EncodedJSValue base, EncodedJSValue value);
+    typedef PutPropertySlot::PutValueFunc PutFunction;
 
     class HashEntry {
@@ -291 +292 @@
     }
 
-    template <class ThisImp>
-    inline void putEntry(ExecState* exec, const HashEntry* entry, PropertyName propertyName, JSValue value, ThisImp* thisObj, bool shouldThrow = false)
+    inline void putEntry(ExecState* exec, const HashEntry* entry, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
     {
         // If this is a function put it as an override property.
         if (entry->attributes() & Function)
-            thisObj->putDirect(exec->vm(), propertyName, value);
-        else if (!(entry->attributes() & ReadOnly))
-            entry->propertyPutter()(exec, JSValue::encode(thisObj), JSValue::encode(value));
-        else if (shouldThrow)
+            slot.base()->putDirect(exec->vm(), propertyName, value);
+        else if (!(entry->attributes() & ReadOnly)) {
+            entry->propertyPutter()(exec, JSValue::encode(slot.thisValue()), JSValue::encode(value));
+            slot.setCustomProperty(slot.base(), entry->propertyPutter());
+        } else if (slot.isStrictMode())
             throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
     }
@@ -308 +309 @@
      * is found it sets the value and returns true, else it returns false.
      */
-    template <class ThisImp>
-    inline bool lookupPut(ExecState* exec, PropertyName propertyName, JSValue value, const HashTable& table, ThisImp* thisObj, bool shouldThrow = false)
+    inline bool lookupPut(ExecState* exec, PropertyName propertyName, JSValue value, const HashTable& table, PutPropertySlot& slot)
     {
         const HashEntry* entry = table.entry(exec, propertyName);
@@ -316 +316 @@
             return false;
 
-        putEntry<ThisImp>(exec, entry, propertyName, value, thisObj, shouldThrow);
+        putEntry(exec, entry, propertyName, value, slot);
         return true;
     }
@@ -329 +329 @@
     inline void lookupPut(ExecState* exec, PropertyName propertyName, JSValue value, const HashTable& table, ThisImp* thisObj, PutPropertySlot& slot)
     {
-        if (!lookupPut<ThisImp>(exec, propertyName, value, table, thisObj, slot.isStrictMode()))
+        if (!lookupPut(exec, propertyName, value, table, slot))
             ParentImp::put(thisObj, exec, propertyName, value, slot); // not found: forward to parent
     }