Modified: trunk/Source/WebCore/ChangeLog (209867 => 209868)
--- trunk/Source/WebCore/ChangeLog 2016-12-15 19:19:51 UTC (rev 209867)
+++ trunk/Source/WebCore/ChangeLog 2016-12-15 20:18:25 UTC (rev 209868)
@@ -1,3 +1,12 @@
+2016-12-15 Ryan Haddad <[email protected]>
+
+ Rebaseline bindings tests after r209864.
+
+ Unreviewed test gardening.
+
+ * bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp:
+ (WebCore::convertDictionary<DictionaryImplName>):
+
2016-12-15 Andreas Kling <[email protected]>
Always clear RenderLayer backing stores when going into page cache.
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp (209867 => 209868)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp 2016-12-15 19:19:51 UTC (rev 209867)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp 2016-12-15 20:18:25 UTC (rev 209868)
@@ -31,6 +31,39 @@
namespace WebCore {
+template<> DictionaryImplName convertDictionary<DictionaryImplName>(ExecState& state, JSValue value)
+{
+ VM& vm = state.vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ bool isNullOrUndefined = value.isUndefinedOrNull();
+ auto* object = isNullOrUndefined ? nullptr : value.getObject();
+ if (UNLIKELY(!isNullOrUndefined && !object)) {
+ throwTypeError(&state, throwScope);
+ return { };
+ }
+ if (UNLIKELY(object && object->type() == RegExpObjectType)) {
+ throwTypeError(&state, throwScope);
+ return { };
+ }
+ DictionaryImplName result;
+ JSValue boolMemberValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "boolMember"));
+ if (!boolMemberValue.isUndefined()) {
+ result.boolMember = convert<IDLBoolean>(state, boolMemberValue);
+ RETURN_IF_EXCEPTION(throwScope, { });
+ }
+ JSValue enumMemberValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "enumMember"));
+ if (!enumMemberValue.isUndefined()) {
+ result.enumMember = convert<IDLEnumeration<TestEnumInStandaloneDictionaryFile>>(state, enumMemberValue);
+ RETURN_IF_EXCEPTION(throwScope, { });
+ }
+ JSValue stringMemberValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "stringMember"));
+ if (!stringMemberValue.isUndefined()) {
+ result.stringMember = convert<IDLDOMString>(state, stringMemberValue);
+ RETURN_IF_EXCEPTION(throwScope, { });
+ }
+ return result;
+}
+
template<> JSString* convertEnumerationToJS(ExecState& state, TestStandaloneDictionary::EnumInStandaloneDictionaryFile enumerationValue)
{
static NeverDestroyed<const String> values[] = {
@@ -70,39 +103,6 @@
return "\"enumValue1\", \"enumValue2\"";
}
-template<> DictionaryImplName convertDictionary<DictionaryImplName>(ExecState& state, JSValue value)
-{
- VM& vm = state.vm();
- auto throwScope = DECLARE_THROW_SCOPE(vm);
- bool isNullOrUndefined = value.isUndefinedOrNull();
- auto* object = isNullOrUndefined ? nullptr : value.getObject();
- if (UNLIKELY(!isNullOrUndefined && !object)) {
- throwTypeError(&state, throwScope);
- return { };
- }
- if (UNLIKELY(object && object->type() == RegExpObjectType)) {
- throwTypeError(&state, throwScope);
- return { };
- }
- DictionaryImplName result;
- JSValue boolMemberValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "boolMember"));
- if (!boolMemberValue.isUndefined()) {
- result.boolMember = convert<IDLBoolean>(state, boolMemberValue);
- RETURN_IF_EXCEPTION(throwScope, { });
- }
- JSValue enumMemberValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "enumMember"));
- if (!enumMemberValue.isUndefined()) {
- result.enumMember = convert<IDLEnumeration<TestEnumInStandaloneDictionaryFile>>(state, enumMemberValue);
- RETURN_IF_EXCEPTION(throwScope, { });
- }
- JSValue stringMemberValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "stringMember"));
- if (!stringMemberValue.isUndefined()) {
- result.stringMember = convert<IDLDOMString>(state, stringMemberValue);
- RETURN_IF_EXCEPTION(throwScope, { });
- }
- return result;
-}
-
} // namespace WebCore
#endif // ENABLE(Condition1)
