Diff
Modified: trunk/Source/WebCore/ChangeLog (210674 => 210675)
--- trunk/Source/WebCore/ChangeLog 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/ChangeLog 2017-01-12 20:38:31 UTC (rev 210675)
@@ -1,3 +1,30 @@
+2017-01-12 Sam Weinig <[email protected]>
+
+ Update bindings test results.
+
+ * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
+ (WebCore::JSTestCustomNamedGetter::getOwnPropertySlot):
+ (WebCore::JSTestCustomNamedGetter::getOwnPropertySlotByIndex):
+ * bindings/scripts/test/JS/JSTestCustomNamedGetter.h:
+ * bindings/scripts/test/JS/JSTestEventTarget.cpp:
+ (WebCore::JSTestEventTarget::getOwnPropertySlot):
+ (WebCore::JSTestEventTarget::getOwnPropertySlotByIndex):
+ (WebCore::JSTestEventTarget::getOwnPropertyNames):
+ * bindings/scripts/test/JS/JSTestEventTarget.h:
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ (WebCore::JSTestInterface::put):
+ (WebCore::JSTestInterface::putByIndex):
+ * bindings/scripts/test/JS/JSTestInterface.h:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::JSTestObj::getOwnPropertySlot):
+ (WebCore::JSTestObj::getOwnPropertySlotByIndex):
+ (WebCore::JSTestObj::getOwnPropertyNames):
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
+ (WebCore::JSTestOverrideBuiltins::getOwnPropertySlot):
+ (WebCore::JSTestOverrideBuiltins::getOwnPropertySlotByIndex):
+ (WebCore::JSTestOverrideBuiltins::getOwnPropertyNames):
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.h:
+
2017-01-12 Zan Dobersek <[email protected]>
[GTK] WebKitWebProcess at 100% CPU loading hyphenation dictionaries
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2017-01-12 20:38:31 UTC (rev 210675)
@@ -24,7 +24,6 @@
#include "JSDOMBinding.h"
#include "JSDOMConstructor.h"
#include "JSDOMConvert.h"
-#include "wtf/text/AtomicString.h"
#include <runtime/Error.h>
#include <runtime/FunctionPrototype.h>
#include <wtf/GetPtr.h>
@@ -140,10 +139,10 @@
if (proto.isObject() && jsCast<JSObject*>(proto)->hasProperty(state, propertyName))
return false;
- if (thisObject->classInfo() == info()) {
+ if (thisObject->classInfo() == info() && !propertyName.isSymbol()) {
JSValue value;
if (thisObject->nameGetter(state, propertyName, value)) {
- slot.setValue(thisObject, ReadOnly | DontEnum, value);
+ slot.setValue(thisObject, ReadOnly, value);
return true;
}
}
@@ -158,7 +157,7 @@
if (thisObject->classInfo() == info()) {
JSValue value;
if (thisObject->nameGetter(state, propertyName, value)) {
- slot.setValue(thisObject, ReadOnly | DontDelete | DontEnum, value);
+ slot.setValue(thisObject, ReadOnly, value);
return true;
}
}
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h 2017-01-12 20:38:31 UTC (rev 210675)
@@ -57,7 +57,6 @@
JSTestCustomNamedGetter(JSC::Structure*, JSDOMGlobalObject&, Ref<TestCustomNamedGetter>&&);
void finishCreation(JSC::VM&);
-private:
bool nameGetter(JSC::ExecState*, JSC::PropertyName, JSC::JSValue&);
};
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2017-01-12 20:38:31 UTC (rev 210675)
@@ -25,7 +25,6 @@
#include "JSDOMConstructor.h"
#include "JSDOMConvert.h"
#include "JSNode.h"
-#include "wtf/text/AtomicString.h"
#include <runtime/Error.h>
#include <runtime/PropertyNameArray.h>
#include <wtf/GetPtr.h>
@@ -128,11 +127,10 @@
{
auto* thisObject = jsCast<JSTestEventTarget*>(object);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- std::optional<uint32_t> optionalIndex = parseIndex(propertyName);
+ auto optionalIndex = parseIndex(propertyName);
if (optionalIndex && optionalIndex.value() < thisObject->wrapped().length()) {
- unsigned index = optionalIndex.value();
- unsigned attributes = ReadOnly;
- slot.setValue(thisObject, attributes, toJS(state, thisObject->globalObject(), thisObject->wrapped().item(index)));
+ auto index = optionalIndex.value();
+ slot.setValue(thisObject, ReadOnly, toJS<IDLInterface<Node>>(*state, *thisObject->globalObject(), thisObject->wrapped().item(index)));
return true;
}
if (Base::getOwnPropertySlot(thisObject, state, propertyName, slot))
@@ -141,10 +139,10 @@
if (proto.isObject() && jsCast<JSObject*>(proto)->hasProperty(state, propertyName))
return false;
- if (!optionalIndex && thisObject->classInfo() == info()) {
- JSValue value;
- if (thisObject->nameGetter(state, propertyName, value)) {
- slot.setValue(thisObject, ReadOnly | DontEnum, value);
+ if (!optionalIndex && thisObject->classInfo() == info() && !propertyName.isSymbol()) {
+ auto item = thisObject->wrapped().namedItem(propertyNameToAtomicString(propertyName));
+ if (!IDLInterface<Node>::isNullValue(item)) {
+ slot.setValue(thisObject, ReadOnly, toJS<IDLInterface<Node>>(*state, *thisObject->globalObject(), item));
return true;
}
}
@@ -156,13 +154,23 @@
auto* thisObject = jsCast<JSTestEventTarget*>(object);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
if (LIKELY(index < thisObject->wrapped().length())) {
- unsigned attributes = DontDelete | ReadOnly;
- slot.setValue(thisObject, attributes, toJS(state, thisObject->globalObject(), thisObject->wrapped().item(index)));
+ slot.setValue(thisObject, ReadOnly, toJS<IDLInterface<Node>>(*state, *thisObject->globalObject(), thisObject->wrapped().item(index)));
return true;
}
return Base::getOwnPropertySlotByIndex(thisObject, state, index, slot);
}
+void JSTestEventTarget::getOwnPropertyNames(JSObject* object, ExecState* state, PropertyNameArray& propertyNames, EnumerationMode mode)
+{
+ auto* thisObject = jsCast<JSTestEventTarget*>(object);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ for (unsigned i = 0, count = thisObject->wrapped().length(); i < count; ++i)
+ propertyNames.add(Identifier::from(state, i));
+ for (auto& propertyName : thisObject->wrapped().supportedPropertyNames())
+ propertyNames.add(Identifier::fromString(state, propertyName));
+ Base::getOwnPropertyNames(thisObject, state, propertyNames, mode);
+}
+
template<> inline JSTestEventTarget* BindingCaller<JSTestEventTarget>::castForOperation(ExecState& state)
{
return jsDynamicDowncast<JSTestEventTarget*>(state.thisValue());
@@ -192,19 +200,6 @@
return domObject->putDirect(state->vm(), state->propertyNames().constructor, value);
}
-void JSTestEventTarget::getOwnPropertyNames(JSObject* object, ExecState* state, PropertyNameArray& propertyNames, EnumerationMode mode)
-{
- auto* thisObject = jsCast<JSTestEventTarget*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- for (unsigned i = 0, count = thisObject->wrapped().length(); i < count; ++i)
- propertyNames.add(Identifier::from(state, i));
- if (mode.includeDontEnumProperties()) {
- for (auto& propertyName : thisObject->wrapped().supportedPropertyNames())
- propertyNames.add(Identifier::fromString(state, propertyName));
- }
- Base::getOwnPropertyNames(thisObject, state, propertyNames, mode);
-}
-
JSValue JSTestEventTarget::getConstructor(VM& vm, const JSGlobalObject* globalObject)
{
return getDOMConstructor<JSTestEventTargetConstructor>(vm, *jsCast<const JSDOMGlobalObject*>(globalObject));
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h 2017-01-12 20:38:31 UTC (rev 210675)
@@ -64,8 +64,6 @@
JSTestEventTarget(JSC::Structure*, JSDOMGlobalObject&, Ref<TestEventTarget>&&);
void finishCreation(JSC::VM&);
-private:
- bool nameGetter(JSC::ExecState*, JSC::PropertyName, JSC::JSValue&);
};
JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestEventTarget&);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2017-01-12 20:38:31 UTC (rev 210675)
@@ -398,6 +398,28 @@
thisObject->JSTestInterface::~JSTestInterface();
}
+bool JSTestInterface::put(JSCell* cell, ExecState* state, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
+{
+ auto* thisObject = jsCast<JSTestInterface*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ bool putResult = false;
+ if (thisObject->putDelegate(state, propertyName, value, slot, putResult))
+ return putResult;
+ return Base::put(thisObject, state, propertyName, value, slot);
+}
+
+bool JSTestInterface::putByIndex(JSCell* cell, ExecState* state, unsigned index, JSValue value, bool shouldThrow)
+{
+ auto* thisObject = jsCast<JSTestInterface*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ Identifier propertyName = Identifier::from(state, index);
+ PutPropertySlot slot(thisObject, shouldThrow);
+ bool putResult = false;
+ if (thisObject->putDelegate(state, propertyName, value, slot, putResult))
+ return putResult;
+ return Base::putByIndex(cell, state, index, value, shouldThrow);
+}
+
template<> inline JSTestInterface* BindingCaller<JSTestInterface>::castForAttribute(ExecState&, EncodedJSValue thisValue)
{
return jsDynamicDowncast<JSTestInterface*>(JSValue::decode(thisValue));
@@ -652,28 +674,6 @@
return domObject->putDirect(state->vm(), state->propertyNames().constructor, value);
}
-bool JSTestInterface::put(JSCell* cell, ExecState* state, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
-{
- auto* thisObject = jsCast<JSTestInterface*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- bool putResult = false;
- if (thisObject->putDelegate(state, propertyName, value, slot, putResult))
- return putResult;
- return Base::put(thisObject, state, propertyName, value, slot);
-}
-
-bool JSTestInterface::putByIndex(JSCell* cell, ExecState* state, unsigned index, JSValue value, bool shouldThrow)
-{
- auto* thisObject = jsCast<JSTestInterface*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- Identifier propertyName = Identifier::from(state, index);
- PutPropertySlot slot(thisObject, shouldThrow);
- bool putResult = false;
- if (thisObject->putDelegate(state, propertyName, value, slot, putResult))
- return putResult;
- return Base::putByIndex(cell, state, index, value, shouldThrow);
-}
-
#if ENABLE(Condition22) || ENABLE(Condition23)
bool setJSTestInterfaceConstructorImplementsStaticAttr(ExecState* statePointer, EncodedJSValue, EncodedJSValue encodedValue)
{
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h 2017-01-12 20:38:31 UTC (rev 210675)
@@ -43,7 +43,6 @@
static TestInterface* toWrapped(JSC::JSValue);
static bool put(JSC::JSCell*, JSC::ExecState*, JSC::PropertyName, JSC::JSValue, JSC::PutPropertySlot&);
static bool putByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::JSValue, bool shouldThrow);
- bool putDelegate(JSC::ExecState*, JSC::PropertyName, JSC::JSValue, JSC::PutPropertySlot&, bool& putResult);
static void destroy(JSC::JSCell*);
DECLARE_INFO;
@@ -80,6 +79,7 @@
JSTestInterface(JSC::Structure*, JSDOMGlobalObject&, Ref<TestInterface>&&);
void finishCreation(JSC::VM&);
+ bool putDelegate(JSC::ExecState*, JSC::PropertyName, JSC::JSValue, JSC::PutPropertySlot&, bool& putResult);
};
class JSTestInterfaceOwner : public JSC::WeakHandleOwner {
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2017-01-12 20:38:31 UTC (rev 210675)
@@ -1939,11 +1939,10 @@
{
auto* thisObject = jsCast<JSTestObj*>(object);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- std::optional<uint32_t> optionalIndex = parseIndex(propertyName);
- if (optionalIndex) {
- unsigned index = optionalIndex.value();
- unsigned attributes = ReadOnly;
- slot.setValue(thisObject, attributes, jsStringOrUndefined(state, thisObject->wrapped().item(index)));
+ auto optionalIndex = parseIndex(propertyName);
+ if (optionalIndex && optionalIndex.value() < thisObject->wrapped().length()) {
+ auto index = optionalIndex.value();
+ slot.setValue(thisObject, ReadOnly, toJS<IDLNullable<IDLDOMString>>(*state, thisObject->wrapped().nullableStringSpecialMethod(index)));
return true;
}
if (Base::getOwnPropertySlot(thisObject, state, propertyName, slot))
@@ -1955,14 +1954,22 @@
{
auto* thisObject = jsCast<JSTestObj*>(object);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (LIKELY(index <= MAX_ARRAY_INDEX)) {
- unsigned attributes = DontDelete | ReadOnly;
- slot.setValue(thisObject, attributes, jsStringOrUndefined(state, thisObject->wrapped().item(index)));
+ if (LIKELY(index < thisObject->wrapped().length())) {
+ slot.setValue(thisObject, ReadOnly, toJS<IDLNullable<IDLDOMString>>(*state, thisObject->wrapped().nullableStringSpecialMethod(index)));
return true;
}
return Base::getOwnPropertySlotByIndex(thisObject, state, index, slot);
}
+void JSTestObj::getOwnPropertyNames(JSObject* object, ExecState* state, PropertyNameArray& propertyNames, EnumerationMode mode)
+{
+ auto* thisObject = jsCast<JSTestObj*>(object);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ for (unsigned i = 0, count = thisObject->wrapped().length(); i < count; ++i)
+ propertyNames.add(Identifier::from(state, i));
+ Base::getOwnPropertyNames(thisObject, state, propertyNames, mode);
+}
+
template<> inline JSTestObj* BindingCaller<JSTestObj>::castForAttribute(ExecState&, EncodedJSValue thisValue)
{
return jsDynamicDowncast<JSTestObj*>(JSValue::decode(thisValue));
@@ -5126,15 +5133,6 @@
}
-void JSTestObj::getOwnPropertyNames(JSObject* object, ExecState* state, PropertyNameArray& propertyNames, EnumerationMode mode)
-{
- auto* thisObject = jsCast<JSTestObj*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- for (unsigned i = 0, count = thisObject->wrapped().length(); i < count; ++i)
- propertyNames.add(Identifier::from(state, i));
- Base::getOwnPropertyNames(thisObject, state, propertyNames, mode);
-}
-
JSValue JSTestObj::getConstructor(VM& vm, const JSGlobalObject* globalObject)
{
return getDOMConstructor<JSTestObjConstructor>(vm, *jsCast<const JSDOMGlobalObject*>(globalObject));
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2017-01-12 20:38:31 UTC (rev 210675)
@@ -25,7 +25,6 @@
#include "JSDOMConstructor.h"
#include "JSDOMConvert.h"
#include "JSNode.h"
-#include "wtf/text/AtomicString.h"
#include <runtime/Error.h>
#include <runtime/FunctionPrototype.h>
#include <wtf/GetPtr.h>
@@ -135,10 +134,10 @@
{
auto* thisObject = jsCast<JSTestOverrideBuiltins*>(object);
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (thisObject->classInfo() == info()) {
- JSValue value;
- if (thisObject->nameGetter(state, propertyName, value)) {
- slot.setValue(thisObject, ReadOnly | DontEnum, value);
+ if (thisObject->classInfo() == info() && !propertyName.isSymbol()) {
+ auto item = thisObject->wrapped().namedItem(propertyNameToAtomicString(propertyName));
+ if (!IDLInterface<Node>::isNullValue(item)) {
+ slot.setValue(thisObject, ReadOnly, toJS<IDLInterface<Node>>(*state, *thisObject->globalObject(), item));
return true;
}
}
@@ -153,9 +152,9 @@
ASSERT_GC_OBJECT_INHERITS(thisObject, info());
Identifier propertyName = Identifier::from(state, index);
if (thisObject->classInfo() == info()) {
- JSValue value;
- if (thisObject->nameGetter(state, propertyName, value)) {
- slot.setValue(thisObject, ReadOnly | DontDelete | DontEnum, value);
+ auto item = thisObject->wrapped().namedItem(propertyNameToAtomicString(propertyName));
+ if (!IDLInterface<Node>::isNullValue(item)) {
+ slot.setValue(thisObject, ReadOnly, toJS<IDLInterface<Node>>(*state, *thisObject->globalObject(), item));
return true;
}
}
@@ -162,6 +161,15 @@
return Base::getOwnPropertySlotByIndex(thisObject, state, index, slot);
}
+void JSTestOverrideBuiltins::getOwnPropertyNames(JSObject* object, ExecState* state, PropertyNameArray& propertyNames, EnumerationMode mode)
+{
+ auto* thisObject = jsCast<JSTestOverrideBuiltins*>(object);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ for (auto& propertyName : thisObject->wrapped().supportedPropertyNames())
+ propertyNames.add(Identifier::fromString(state, propertyName));
+ Base::getOwnPropertyNames(thisObject, state, propertyNames, mode);
+}
+
template<> inline JSTestOverrideBuiltins* BindingCaller<JSTestOverrideBuiltins>::castForOperation(ExecState& state)
{
return jsDynamicDowncast<JSTestOverrideBuiltins*>(state.thisValue());
@@ -191,17 +199,6 @@
return domObject->putDirect(state->vm(), state->propertyNames().constructor, value);
}
-void JSTestOverrideBuiltins::getOwnPropertyNames(JSObject* object, ExecState* state, PropertyNameArray& propertyNames, EnumerationMode mode)
-{
- auto* thisObject = jsCast<JSTestOverrideBuiltins*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- if (mode.includeDontEnumProperties()) {
- for (auto& propertyName : thisObject->wrapped().supportedPropertyNames())
- propertyNames.add(Identifier::fromString(state, propertyName));
- }
- Base::getOwnPropertyNames(thisObject, state, propertyNames, mode);
-}
-
JSValue JSTestOverrideBuiltins::getConstructor(VM& vm, const JSGlobalObject* globalObject)
{
return getDOMConstructor<JSTestOverrideBuiltinsConstructor>(vm, *jsCast<const JSDOMGlobalObject*>(globalObject));
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h (210674 => 210675)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h 2017-01-12 20:21:58 UTC (rev 210674)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h 2017-01-12 20:38:31 UTC (rev 210675)
@@ -58,8 +58,6 @@
JSTestOverrideBuiltins(JSC::Structure*, JSDOMGlobalObject&, Ref<TestOverrideBuiltins>&&);
void finishCreation(JSC::VM&);
-private:
- bool nameGetter(JSC::ExecState*, JSC::PropertyName, JSC::JSValue&);
};
class JSTestOverrideBuiltinsOwner : public JSC::WeakHandleOwner {
