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

Revision: 15408
          http://sourceforge.net/p/htmlunit/code/15408
Author:   rbri
Date:     2018-06-29 11:20:25 +0000 (Fri, 29 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/speech/SpeechSynthesisErrorEvent.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/speech/SpeechSynthesisErrorEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/speech/SpeechSynthesisErrorEvent.java	2018-06-29 09:33:09 UTC (rev 15407)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/speech/SpeechSynthesisErrorEvent.java	2018-06-29 11:20:25 UTC (rev 15408)
@@ -16,10 +16,9 @@
 
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
 
-import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstant;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
+import com.gargoylesoftware.htmlunit.javascript.host.event.SpeechSynthesisEvent;
 
 /**
  * A JavaScript object for {@code SpeechSynthesisErrorEvent}.
@@ -27,40 +26,8 @@
  * @author Ronald Brill
  */
 @JsxClass(FF)
-public class SpeechSynthesisErrorEvent extends SimpleScriptable {
+public class SpeechSynthesisErrorEvent extends SpeechSynthesisEvent {
 
-    /** Constant. */
-    @JsxConstant(FF)
-    public static final int ALT_MASK = 0x1;
-
-    /** Constant. */
-    @JsxConstant(FF)
-    public static final int CONTROL_MASK = 0x2;
-
-    /** Constant. */
-    @JsxConstant(FF)
-    public static final int SHIFT_MASK = 0x4;
-
-    /** Constant. */
-    @JsxConstant(FF)
-    public static final int META_MASK = 0x8;
-
-    /** The first event phase: the capturing phase. */
-    @JsxConstant(FF)
-    public static final short CAPTURING_PHASE = 1;
-
-    /** The second event phase: at the event target. */
-    @JsxConstant(FF)
-    public static final short AT_TARGET = 2;
-
-    /** The third (and final) event phase: the bubbling phase. */
-    @JsxConstant(FF)
-    public static final short BUBBLING_PHASE = 3;
-
-    /** No event phase. */
-    @JsxConstant(FF)
-    public static final short NONE = 0;
-
     /**
      * Creates a new instance.
      */

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java	2018-06-29 09:33:09 UTC (rev 15407)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java	2018-06-29 11:20:25 UTC (rev 15408)
@@ -156,7 +156,7 @@
                 runners_.add(new BrowserVersionClassRunnerWithParameters(
                         klass, BrowserVersion.CHROME, false, tests));
             }
-            if (browsers.contains("hu_ff60")) {
+            if (browsers.contains("hu-ff60")) {
                 runners_.add(new BrowserVersionClassRunnerWithParameters(
                         klass, BrowserVersion.FIREFOX_60, false, tests));
             }


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot