Modified: trunk/Source/WebCore/ChangeLog (200547 => 200548)
--- trunk/Source/WebCore/ChangeLog 2016-05-07 21:14:20 UTC (rev 200547)
+++ trunk/Source/WebCore/ChangeLog 2016-05-07 21:36:39 UTC (rev 200548)
@@ -1,3 +1,10 @@
+2016-05-07 Chris Dumez <[email protected]>
+
+ Unreviewed, rebaseline bindings tests after r200547.
+
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::convert<TestObj::FontFaceDescriptors>):
+
2016-05-07 Darin Adler <[email protected]>
Next step on dictionary bindings, along with other bindings refinements
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (200547 => 200548)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-07 21:14:20 UTC (rev 200547)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-07 21:36:39 UTC (rev 200548)
@@ -492,19 +492,19 @@
template<> TestObj::FontFaceDescriptors convert<TestObj::FontFaceDescriptors>(ExecState& state, JSValue value)
{
auto style = convertOptional<String>(state, propertyValue(state, value, "style"), "normal");
- if (state.hadException())
+ if (UNLIKELY(state.hadException()))
return { };
auto weight = convertOptional<String>(state, propertyValue(state, value, "weight"), "normal");
- if (state.hadException())
+ if (UNLIKELY(state.hadException()))
return { };
auto stretch = convertOptional<String>(state, propertyValue(state, value, "stretch"), "normal");
- if (state.hadException())
+ if (UNLIKELY(state.hadException()))
return { };
auto unicodeRange = convertOptional<String>(state, propertyValue(state, value, "unicodeRange"), "U+0-10FFFF");
- if (state.hadException())
+ if (UNLIKELY(state.hadException()))
return { };
auto variant = convertOptional<String>(state, propertyValue(state, value, "variant"), "normal");
- if (state.hadException())
+ if (UNLIKELY(state.hadException()))
return { };
auto featureSettings = convertOptional<String>(state, propertyValue(state, value, "featureSettings"), "normal");
return { WTFMove(style), WTFMove(weight), WTFMove(stretch), WTFMove(unicodeRange), WTFMove(variant), WTFMove(featureSettings) };
