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

Timestamp:

Dec 23, 2013, 4:11:25 PM (12 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/PutPropertySlot.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/PutPropertySlot.h

@@ -28 +28 @@
 #define PutPropertySlot_h
 
+#include "JSCJSValue.h"
+
 #include <wtf/Assertions.h>
 
@@ -37 +39 @@
     class PutPropertySlot {
     public:
-        enum Type { Uncachable, ExistingProperty, NewProperty };
+        enum Type { Uncachable, ExistingProperty, NewProperty, CustomProperty };
         enum Context { UnknownContext, PutById, PutByIdEval };
+        typedef void (*PutValueFunc)(ExecState*, EncodedJSValue base, EncodedJSValue value);
 
-        PutPropertySlot(bool isStrictMode = false, Context context = UnknownContext)
+        PutPropertySlot(JSValue thisValue, bool isStrictMode = false, Context context = UnknownContext)
             : m_type(Uncachable)
             , m_base(0)
+            , m_thisValue(thisValue)
             , m_isStrictMode(isStrictMode)
             , m_context(context)
+            , m_putFunction(nullptr)
         {
         }
@@ -61 +66 @@
             m_offset = offset;
         }
+
+        void setCustomProperty(JSObject* base, PutValueFunc function)
+        {
+            m_type = CustomProperty;
+            m_base = base;
+            m_putFunction = function;
+        }
         
         Context context() const { return static_cast<Context>(m_context); }
@@ -66 +78 @@
         Type type() const { return m_type; }
         JSObject* base() const { return m_base; }
+        JSValue thisValue() const { return m_thisValue; }
 
         bool isStrictMode() const { return m_isStrictMode; }
-        bool isCacheable() const { return m_type != Uncachable; }
+        bool isCacheable() const { return m_type != Uncachable && m_type != CustomProperty; }
         PropertyOffset cachedOffset() const
         {
@@ -78 +91 @@
         Type m_type;
         JSObject* m_base;
+        JSValue m_thisValue;
         PropertyOffset m_offset;
         bool m_isStrictMode;
         uint8_t m_context;
+        PutValueFunc m_putFunction;
+
     };