[PATCH v2 02/13] mshtml: Implement performance.timing.navigationStart.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/mshtml_private.h      |  2 ++
 dlls/mshtml/navigate.c            |  4 +++-
 dlls/mshtml/omnavigator.c         | 12 ++++++++++--
 dlls/mshtml/tests/documentmode.js |  2 ++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index e8dd0997639..77a23362415 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -594,6 +594,8 @@ struct HTMLInnerWindow {
     IMoniker *mon;
     nsChannelBSC *bscallback;
     struct list bindings;
+
+    ULONGLONG navigation_start_time;
 };

#define NO_PERFORMANCE_OBJ ((IHTMLPerformance*)IntToPtr(-1))
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 5825e0f27c0..79c88ae31fc 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -1357,8 +1357,10 @@ static HRESULT nsChannelBSC_start_binding(BSCallback *bsc)
 {
     nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc);

-    if(This->is_doc_channel)
+    if(This->is_doc_channel) {
         This->bsc.window->base.outer_window->base.inner_window->doc->skip_mutation_notif = FALSE;
+        This->bsc.window->navigation_start_time = get_time_stamp();
+    }

return S_OK;
 }
diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c
index f25cce2c105..34514115030 100644
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@@ -1502,6 +1502,7 @@ typedef struct {
     IHTMLPerformanceTiming IHTMLPerformanceTiming_iface;

LONG ref;
+    HTMLInnerWindow *window;
 } HTMLPerformanceTiming;

static inline HTMLPerformanceTiming *impl_from_IHTMLPerformanceTiming(IHTMLPerformanceTiming *iface)
@@ -1549,6 +1550,7 @@ static ULONG WINAPI HTMLPerformanceTiming_Release(IHTMLPerformanceTiming *iface)
     TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
+        IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface);
         release_dispex(&This->dispex);
         heap_free(This);
     }
@@ -1597,9 +1599,9 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_navigationStart(IHTMLPerformance
 {
     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->navigation_start_time;
     return S_OK;
 }

@@ -2154,12 +2156,18 @@ static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLP
     if(!This->timing) {
         HTMLPerformanceTiming *timing;

+        if(!This->window)
+            return E_UNEXPECTED;
+
         timing = heap_alloc_zero(sizeof(*timing));
         if(!timing)
             return E_OUTOFMEMORY;

timing->IHTMLPerformanceTiming_iface.lpVtbl = &HTMLPerformanceTimingVtbl;
         timing->ref = 1;
+        timing->window = This->window;
+        IHTMLWindow2_AddRef(&timing->window->base.IHTMLWindow2_iface);
+
         init_dispatch(&timing->dispex, (IUnknown*)&timing->IHTMLPerformanceTiming_iface,
                       &HTMLPerformanceTiming_dispex, dispex_compat_mode(&This->dispex));

diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js
index 33d60f7e835..f83597d305a 100644
--- a/dlls/mshtml/tests/documentmode.js
+++ b/dlls/mshtml/tests/documentmode.js
@@ -19,6 +19,8 @@
 var compat_version;
 var tests = [];

+ok(performance.timing.navigationStart > 0, "navigationStart <= 0");
+
 var pageshow_fired = false, pagehide_fired = false;
 document.doc_unload_events_called = false;
 window.onbeforeunload = function() { ok(false, "beforeunload fired"); };