diff options
Diffstat (limited to 'Source/WebCore/bridge/runtime_object.h')
| -rw-r--r-- | Source/WebCore/bridge/runtime_object.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/WebCore/bridge/runtime_object.h b/Source/WebCore/bridge/runtime_object.h index 97b55506f..16c0429f5 100644 --- a/Source/WebCore/bridge/runtime_object.h +++ b/Source/WebCore/bridge/runtime_object.h @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -32,13 +32,14 @@ namespace JSC { namespace Bindings { -class RuntimeObject : public JSDestructibleObject { +class WEBCORE_EXPORT RuntimeObject : public JSDestructibleObject { public: typedef JSDestructibleObject Base; + static const unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot | OverridesGetPropertyNames | TypeOfShouldCallGetCallData; - static RuntimeObject* create(VM& vm, Structure* structure, PassRefPtr<Instance> instance) + static RuntimeObject* create(VM& vm, Structure* structure, RefPtr<Instance>&& instance) { - RuntimeObject* object = new (NotNull, allocateCell<RuntimeObject>(vm.heap)) RuntimeObject(vm, structure, instance); + RuntimeObject* object = new (NotNull, allocateCell<RuntimeObject>(vm.heap)) RuntimeObject(vm, structure, WTFMove(instance)); object->finishCreation(vm); return object; } @@ -46,7 +47,7 @@ public: static void destroy(JSCell*); static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&); - static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&); + static bool put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&); static bool deleteProperty(JSCell*, ExecState*, PropertyName); static JSValue defaultValue(const JSObject*, ExecState*, PreferredPrimitiveType); static CallType getCallData(JSCell*, CallData&); @@ -58,7 +59,7 @@ public: Instance* getInternalInstance() const { return m_instance.get(); } - static JSObject* throwInvalidAccessError(ExecState*); + static JSObject* throwInvalidAccessError(ExecState*, ThrowScope&); DECLARE_INFO; @@ -73,14 +74,13 @@ public: } protected: - RuntimeObject(VM&, Structure*, PassRefPtr<Instance>); + RuntimeObject(VM&, Structure*, RefPtr<Instance>&&); void finishCreation(VM&); - static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | Base::StructureFlags; private: - static EncodedJSValue fallbackObjectGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName); - static EncodedJSValue fieldGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName); - static EncodedJSValue methodGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName); + static EncodedJSValue fallbackObjectGetter(ExecState*, EncodedJSValue, PropertyName); + static EncodedJSValue fieldGetter(ExecState*, EncodedJSValue, PropertyName); + static EncodedJSValue methodGetter(ExecState*, EncodedJSValue, PropertyName); RefPtr<Instance> m_instance; }; |