Backed out changeset b3b5af78a162 (bug 919391) for failures in resource-timing.html
authorPhil Ringnalda <philringnalda@gmail.com>
Thu, 08 Dec 2016 19:27:05 -0800
changeset 325477 a77180ae4e06fe05353d97beaa750ec65c3ce2d6
parent 325476 698bbf4f2e26f4d7ad40961cfaa0f12bb882527f
child 325478 6474932e4e65d2f808803218fe0f306e14c0ff82
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
bugs919391
milestone53.0a1
backs outb3b5af78a162b11a9a838087c0f6ad3567eeb55e
Backed out changeset b3b5af78a162 (bug 919391) for failures in resource-timing.html MozReview-Commit-ID: ExeMekKcoJd
dom/performance/PerformanceTiming.cpp
testing/web-platform/meta/resource-timing/resource-timing.html.ini
testing/web-platform/meta/resource-timing/test_resource_timing.html.ini
testing/web-platform/tests/resource-timing/resources/gzip_xml.py
--- a/dom/performance/PerformanceTiming.cpp
+++ b/dom/performance/PerformanceTiming.cpp
@@ -310,21 +310,16 @@ PerformanceTiming::ResponseStartHighRes(
 {
   if (!nsContentUtils::IsPerformanceTimingEnabled() || !IsInitialized()) {
     return mZeroTime;
   }
   if (mResponseStart.IsNull() ||
      (!mCacheReadStart.IsNull() && mCacheReadStart < mResponseStart)) {
     mResponseStart = mCacheReadStart;
   }
-
-  if (mResponseStart.IsNull() ||
-      (!mRequestStart.IsNull() && mResponseStart < mRequestStart)) {
-    mResponseStart = mRequestStart;
-  }
   return TimeStampToDOMHighResOrFetchStart(mResponseStart);
 }
 
 DOMTimeMilliSec
 PerformanceTiming::ResponseStart()
 {
   return static_cast<int64_t>(ResponseStartHighRes());
 }
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/resource-timing/resource-timing.html.ini
@@ -0,0 +1,3 @@
+[resource-timing.html]
+  type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1290858
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini
@@ -0,0 +1,5 @@
+[test_resource_timing.html]
+  type: testharness
+  [PerformanceEntry has correct network transfer attributes (xmlhttprequest)]
+    expected: FAIL
+
--- a/testing/web-platform/tests/resource-timing/resources/gzip_xml.py
+++ b/testing/web-platform/tests/resource-timing/resources/gzip_xml.py
@@ -1,16 +1,13 @@
 import gzip as gzip_module
 from cStringIO import StringIO
-import os
 
 def main(request, response):
-    dir_path = os.path.dirname(os.path.realpath(__file__))
-    file_path = os.path.join(dir_path, 'resource_timing_test0.xml')
-    f = open(file_path, 'r')
+    f = open('resource-timing/resources/resource_timing_test0.xml', 'r')
     output = f.read()
 
     out = StringIO()
     with gzip_module.GzipFile(fileobj=out, mode="w") as f:
       f.write(output)
     output = out.getvalue()
 
     headers = [("Content-type", "text/plain"),