[PATCH v2 04/13] mshtml: Implement performance.timing.unloadEventStart & unloadEventEnd.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/htmlwindow.c          | 3 +++
 dlls/mshtml/mshtml_private.h      | 2 ++
 dlls/mshtml/nsevents.c            | 9 ++++++++-
 dlls/mshtml/omnavigator.c         | 8 ++++----
 dlls/mshtml/tests/documentmode.js | 2 ++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 1d3c71d83bf..dcf21460b8d 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -4116,6 +4116,9 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow
         return hres;
     }

+    /* Initial empty doc does not have unload events or timings */
+    window->base.inner_window->doc->unload_sent = TRUE;
+
     if(parent) {
         IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);

diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 4bf8fb65624..90aba4e9236 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -596,6 +596,8 @@ struct HTMLInnerWindow {
     struct list bindings;

ULONGLONG navigation_start_time;
+    ULONGLONG unload_event_start_time;
+    ULONGLONG unload_event_end_time;
     ULONGLONG redirect_time;
 };

diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c
index 0248737b012..f2f17bc180a 100644
--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -383,8 +383,8 @@ static nsresult NSAPI handle_beforeunload(nsIDOMEventListener *iface, nsIDOMEven
 static nsresult NSAPI handle_unload(nsIDOMEventListener *iface, nsIDOMEvent *nsevent)
 {
     nsEventListener *This = impl_from_nsIDOMEventListener(iface);
+    HTMLInnerWindow *window, *pending_window;
     HTMLDocumentNode *doc = This->This->doc;
-    HTMLInnerWindow *window;
     DOMEvent *event;
     HRESULT hres;

@@ -392,12 +392,19 @@ static nsresult NSAPI handle_unload(nsIDOMEventListener *iface, nsIDOMEvent *nse
         return NS_OK;
     doc->unload_sent = TRUE;

+    pending_window = window->base.outer_window->pending_window;
+    if(pending_window)
+        pending_window->unload_event_start_time = get_time_stamp();
+
     hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event);
     if(SUCCEEDED(hres)) {
         dispatch_event(&window->event_target, event);
         IDOMEvent_Release(&event->IDOMEvent_iface);
     }

+    if(pending_window)
+        pending_window->unload_event_end_time = get_time_stamp();
+
     return NS_OK;
 }

diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c
index f2afa1a9611..d6464ae8630 100644
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@@ -1609,9 +1609,9 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_unloadEventStart(IHTMLPerformanc
 {
     HTMLPerformanceTiming *This = impl_from_IHTMLPerformanceTiming(iface);

-    FIXME("(%p)->(%p) returning fake value\n", This, p);
+    TRACE("(%p)->(%p)\n", This, p);

-    *p = TIMING_FAKE_TIMESTAMP;
+    *p = This->window->unload_event_start_time;
     return S_OK;
 }

@@ -1619,9 +1619,9 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_unloadEventEnd(IHTMLPerformanceT
 {
     HTMLPerformanceTiming *This = impl_from_IHTMLPerformanceTiming(iface);

-    FIXME("(%p)->(%p) returning fake value\n", This, p);
+    TRACE("(%p)->(%p)\n", This, p);

-    *p = TIMING_FAKE_TIMESTAMP;
+    *p = This->window->unload_event_end_time;
     return S_OK;
 }

diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js
index f0a91fea545..a9c2b36ceee 100644
--- a/dlls/mshtml/tests/documentmode.js
+++ b/dlls/mshtml/tests/documentmode.js
@@ -20,6 +20,8 @@ var compat_version;
 var tests = [];

ok(performance.timing.navigationStart > 0, "navigationStart <= 0");
+ok(performance.timing.unloadEventStart === 0, "unloadEventStart != 0");
+ok(performance.timing.unloadEventEnd === 0, "unloadEventEnd != 0");
 ok(performance.timing.redirectStart === 0, "redirectStart != 0");

var pageshow_fired = false, pagehide_fired = false;