[PATCH 05/13] mshtml: Implement the remaining pre-response performance.timing props.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

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

diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 90aba4e9236..59439823817 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -599,6 +599,9 @@ struct HTMLInnerWindow {
     ULONGLONG unload_event_start_time;
     ULONGLONG unload_event_end_time;
     ULONGLONG redirect_time;
+    ULONGLONG dns_lookup_time;
+    ULONGLONG connect_time;
+    ULONGLONG request_time;
 };

#define NO_PERFORMANCE_OBJ ((IHTMLPerformance*)IntToPtr(-1))
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 06e3b1e9544..6ca2fbe1dcb 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -1720,6 +1720,18 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG progress, ULONG t
         if(This->is_doc_channel && !This->bsc.window->redirect_time)
             This->bsc.window->redirect_time = get_time_stamp();
         return handle_redirect(This, status_text);
+    case BINDSTATUS_FINDINGRESOURCE:
+        if(This->is_doc_channel && !This->bsc.window->dns_lookup_time)
+            This->bsc.window->dns_lookup_time = get_time_stamp();
+        break;
+    case BINDSTATUS_CONNECTING:
+        if(This->is_doc_channel)
+            This->bsc.window->connect_time = get_time_stamp();
+        break;
+    case BINDSTATUS_SENDINGREQUEST:
+        if(This->is_doc_channel)
+            This->bsc.window->request_time = get_time_stamp();
+        break;
     case BINDSTATUS_BEGINDOWNLOADDATA: {
         IWinInetHttpInfo *http_info;
         DWORD status, size = sizeof(DWORD);
diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c
index 013330e9658..1a9c6174214 100644
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@@ -1595,6 +1595,24 @@ static HRESULT WINAPI HTMLPerformanceTiming_Invoke(IHTMLPerformanceTiming *iface

#define TIMING_FAKE_TIMESTAMP 0xdeadbeef

+static ULONGLONG get_fetch_time(HTMLPerformanceTiming *This)
+{
+    /* If there's no prior doc unloaded and no redirects, fetch time == navigationStart time */
+    if(!This->window->unload_event_end_time && !This->window->redirect_time)
+        return This->window->navigation_start_time;
+
+    if(This->window->dns_lookup_time)
+        return This->window->dns_lookup_time;
+    if(This->window->connect_time)
+        return This->window->connect_time;
+    if(This->window->request_time)
+        return This->window->request_time;
+    if(This->window->unload_event_end_time)
+        return This->window->unload_event_end_time;
+
+    return This->window->redirect_time;
+}
+
 static HRESULT WINAPI HTMLPerformanceTiming_get_navigationStart(IHTMLPerformanceTiming *iface, ULONGLONG *p)
 {
     HTMLPerformanceTiming *This = impl_from_IHTMLPerformanceTiming(iface);
@@ -1639,9 +1657,9 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_redirectEnd(IHTMLPerformanceTimi
 {
     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->redirect_time ? get_fetch_time(This) : 0;
     return S_OK;
 }

@@ -1649,9 +1667,9 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_fetchStart(IHTMLPerformanceTimin
 {
     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 = get_fetch_time(This);
     return S_OK;
 }

@@ -1659,9 +1677,9 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_domainLookupStart(IHTMLPerforman
 {
     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->dns_lookup_time ? This->window->dns_lookup_time : get_fetch_time(This);
     return S_OK;
 }

@@ -1669,9 +1687,10 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_domainLookupEnd(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->connect_time    ? This->window->connect_time    :
+         This->window->dns_lookup_time ? This->window->dns_lookup_time : get_fetch_time(This);
     return S_OK;
 }

@@ -1679,9 +1698,10 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_connectStart(IHTMLPerformanceTim
 {
     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->connect_time    ? This->window->connect_time    :
+         This->window->dns_lookup_time ? This->window->dns_lookup_time : get_fetch_time(This);
     return S_OK;
 }

@@ -1689,9 +1709,11 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_connectEnd(IHTMLPerformanceTimin
 {
     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->request_time    ? This->window->request_time    :
+         This->window->connect_time    ? This->window->connect_time    :
+         This->window->dns_lookup_time ? This->window->dns_lookup_time : get_fetch_time(This);
     return S_OK;
 }

@@ -1699,9 +1721,11 @@ static HRESULT WINAPI HTMLPerformanceTiming_get_requestStart(IHTMLPerformanceTim
 {
     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->request_time    ? This->window->request_time    :
+         This->window->connect_time    ? This->window->connect_time    :
+         This->window->dns_lookup_time ? This->window->dns_lookup_time : get_fetch_time(This);
     return S_OK;
 }

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

ok(performance.timing.navigationStart > 0, "navigationStart <= 0");
+ok(performance.timing.fetchStart == performance.timing.navigationStart, "fetchStart != navigationStart");
+ok(performance.timing.domainLookupStart >= performance.timing.fetchStart, "domainLookupStart < fetchStart");
+ok(performance.timing.domainLookupEnd >= performance.timing.domainLookupStart, "domainLookupEnd < domainLookupStart");
+ok(performance.timing.connectStart >= performance.timing.domainLookupEnd, "connectStart < domainLookupEnd");
+ok(performance.timing.connectEnd >= performance.timing.connectStart, "connectEnd < connectStart");
+ok(performance.timing.requestStart >= performance.timing.connectEnd, "requestStart < connectEnd");
 ok(performance.timing.unloadEventStart === 0, "unloadEventStart != 0");
 ok(performance.timing.unloadEventEnd === 0, "unloadEventEnd != 0");
 ok(performance.timing.redirectStart === 0, "redirectStart != 0");
+ok(performance.timing.redirectEnd === 0, "redirectEnd != 0");

var pageshow_fired = false, pagehide_fired = false;
 document.doc_unload_events_called = false;