Merge remote-tracking branch 'origin/5.8' into 5.95.9.0

Change-Id: Ib8d14ead6c781186d2519366552b896327d4f715

1 files changed, 37 insertions, 1 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml
index 720b4cd04..b4576af36 100644
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml
@@ -78,7 +78,43 @@ Item {
             resultSpy.wait()
 
             compare(JSON.stringify(webView.lastResult),
-                '{"child":{"level":2},"level":"1"}')
+                '{"level":"1","child":{"level":2}}')
+        }
+
+        function test_undefinedValue() {
+            resultSpy.clear()
+            webView.url = "about:blank"
+            verify(webView.waitForLoadSucceeded())
+
+            webView.experimental.evaluateJavaScript(
+                "(function() { })()",
+
+                function(result) {
+                    webView.lastResult = result
+                })
+
+            resultSpy.wait()
+            verify(typeof webView.lastResult === "undefined")
+            compare(webView.lastResult, undefined)
+        }
+
+        function test_nullValue() {
+            resultSpy.clear()
+
+            webView.url = "about:blank"
+            verify(webView.waitForLoadSucceeded())
+
+            webView.experimental.evaluateJavaScript(
+                "(function() { return { value: null } })()",
+
+                function(result) {
+                    webView.lastResult = result
+                })
+
+            resultSpy.wait()
+            verify(typeof webView.lastResult === "object")
+            verify(typeof webView.lastResult.value === "object")
+            compare(webView.lastResult.value, null)
         }
 
         function test_booleanValue() {