[HtmlUnit] SVN: [15365] trunk/htmlunit/src

[<rb...@us...>]

Revision: 15365
          http://sourceforge.net/p/htmlunit/code/15365
Author:   rbri
Date:     2018-06-20 06:52:37 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTiming.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTimingTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTiming.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTiming.java	2018-06-20 06:48:47 UTC (rev 15364)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTiming.java	2018-06-20 06:52:37 UTC (rev 15365)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -131,7 +132,7 @@
     /**
      * @return a secureConnectionStart
      */
-    @JsxGetter(CHROME)
+    @JsxGetter({CHROME, FF60})
     public long getSecureConnectionStart() {
         return 0;
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTimingTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTimingTest.java	2018-06-20 06:48:47 UTC (rev 15364)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTimingTest.java	2018-06-20 06:52:37 UTC (rev 15365)
@@ -87,7 +87,8 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            CHROME = "0")
+            CHROME = "0",
+            FF60 = "0")
     public void secureConnectionStart() throws Exception {
         final String html =
                 HtmlPageTest.STANDARDS_MODE_PREFIX_