V8Serialization - ConvertDateTimeToCefTime convert to UTC time

amaitland · amaitland · commit f3877be19a48 · 2019-02-28T20:29:58.000+10:00
BindingTest.html - Add QUnit test Resolves #2662
diff --git a/CefSharp.Core/Internals/Serialization/V8Serialization.cpp b/CefSharp.Core/Internals/Serialization/V8Serialization.cpp
@@ -183,7 +183,7 @@ namespace CefSharp
 
             CefTime ConvertDateTimeToCefTime(DateTime dateTime)
             {
-                auto timeSpan = dateTime - DateTime(1970, 1, 1);
+                auto timeSpan = dateTime.ToUniversalTime() - DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind::Utc);
 
                 return CefTime(timeSpan.TotalSeconds);
             }
diff --git a/CefSharp.Example/JavascriptBinding/BoundObject.cs b/CefSharp.Example/JavascriptBinding/BoundObject.cs
@@ -53,6 +53,18 @@ public BoundObject()
             ExceptionTestObject = new ExceptionTestBoundObject();
         }
 
+        public void TestCallbackWithDateTime(IJavascriptCallback javascriptCallback)
+        {
+            Task.Run(async () =>
+            {
+                using (javascriptCallback)
+                {
+                    var dateTime = new DateTime(2019, 01, 01, 12, 00, 00);
+                    await javascriptCallback.ExecuteAsync(dateTime, new[] { dateTime.Year, dateTime.Month, dateTime.Day, dateTime.Hour, dateTime.Minute, dateTime.Second });
+                }
+            });
+        }
+
         public void TestCallback(IJavascriptCallback javascriptCallback)
         {
             const int taskDelay = 1500;
diff --git a/CefSharp.Example/Resources/BindingTest.html b/CefSharp.Example/Resources/BindingTest.html
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
     <head>
         <title>Binding Test</title>
@@ -439,6 +439,22 @@
                 });
             });
 
+            QUnit.test("Javascript Callback Test with DateTime", function( assert )
+            {
+                var asyncCallback = assert.async();
+
+                function callback(dateTimeFirst, dateTimeSecondAsArray)
+                {
+                    var arr = dateTimeSecondAsArray;
+                    var dateTimeSecond = new Date(arr[0], arr[1] - 1, arr[2], arr[3], arr[4], arr[5]);
+                    assert.equal(dateTimeFirst - dateTimeSecond, 0);
+
+                    asyncCallback();
+                }
+
+                bound.testCallbackWithDateTime(callback);
+            });
+
             QUnit.test("Javascript Callback Test", function( assert )
             {
                 var asyncCallback = assert.async();

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ namespace CefSharp`
`183`	`183`
`184`	`184`	`CefTime ConvertDateTimeToCefTime(DateTime dateTime)`
`185`	`185`	`{`
`186`		`- auto timeSpan = dateTime - DateTime(1970, 1, 1);`
	`186`	`+ auto timeSpan = dateTime.ToUniversalTime() - DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind::Utc);`
`187`	`187`
`188`	`188`	`return CefTime(timeSpan.TotalSeconds);`
`189`	`189`	`}`