Title: [199706] trunk/Source/WebCore
- Revision
- 199706
- Author
- [email protected]
- Date
- 2016-04-18 22:05:42 -0700 (Mon, 18 Apr 2016)
Log Message
Updated binding test result to reflect the change to not use Deprecated::ScriptValue.
* bindings/scripts/test/JS/JSTestObj.cpp: Regenerated with new script.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (199705 => 199706)
--- trunk/Source/WebCore/ChangeLog 2016-04-19 04:05:30 UTC (rev 199705)
+++ trunk/Source/WebCore/ChangeLog 2016-04-19 05:05:42 UTC (rev 199706)
@@ -1,5 +1,11 @@
2016-04-18 Darin Adler <[email protected]>
+ Updated binding test result to reflect the change to not use Deprecated::ScriptValue.
+
+ * bindings/scripts/test/JS/JSTestObj.cpp: Regenerated with new script.
+
+2016-04-18 Darin Adler <[email protected]>
+
Remove all use of Deprecated::ScriptValue in generated bindings
https://bugs.webkit.org/show_bug.cgi?id=156706
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (199705 => 199706)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-19 04:05:30 UTC (rev 199705)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-04-19 05:05:42 UTC (rev 199706)
@@ -59,7 +59,6 @@
#include "URL.h"
#include "WebCoreJSClientData.h"
#include "bool.h"
-#include <bindings/ScriptValue.h>
#include <inspector/ScriptArguments.h>
#include <inspector/ScriptCallStackFactory.h>
#include <runtime/Error.h>
@@ -1767,7 +1766,7 @@
if (JSValue cachedValue = castedThis->m_cachedAttribute1.get())
return JSValue::encode(cachedValue);
auto& impl = castedThis->wrapped();
- JSValue result = (impl.cachedAttribute1().hasNoValue() ? jsNull() : impl.cachedAttribute1().jsValue());
+ JSValue result = impl.cachedAttribute1();
castedThis->m_cachedAttribute1.set(state->vm(), castedThis, result);
return JSValue::encode(result);
}
@@ -1785,7 +1784,7 @@
if (JSValue cachedValue = castedThis->m_cachedAttribute2.get())
return JSValue::encode(cachedValue);
auto& impl = castedThis->wrapped();
- JSValue result = (impl.cachedAttribute2().hasNoValue() ? jsNull() : impl.cachedAttribute2().jsValue());
+ JSValue result = impl.cachedAttribute2();
castedThis->m_cachedAttribute2.set(state->vm(), castedThis, result);
return JSValue::encode(result);
}
@@ -1801,7 +1800,7 @@
return throwGetterTypeError(*state, "TestObj", "anyAttribute");
}
auto& impl = castedThis->wrapped();
- JSValue result = (impl.anyAttribute().hasNoValue() ? jsNull() : impl.anyAttribute().jsValue());
+ JSValue result = impl.anyAttribute();
return JSValue::encode(result);
}
@@ -3027,7 +3026,7 @@
return throwSetterTypeError(*state, "TestObj", "anyAttribute");
}
auto& impl = castedThis->wrapped();
- Deprecated::ScriptValue nativeValue = { state->vm(), value };
+ JSC::JSValue nativeValue = value;
if (UNLIKELY(state->hadException()))
return false;
impl.setAnyAttribute(nativeValue);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
