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

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

Revision: 11999
          http://sourceforge.net/p/htmlunit/code/11999
Author:   rbri
Date:     2016-03-04 09:36:53 +0000 (Fri, 04 Mar 2016)
Log Message:
-----------
adapt for latest chrome

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/RecursiveFunctionObject.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2016-03-04 09:24:48 UTC (rev 11998)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2016-03-04 09:36:53 UTC (rev 11999)
@@ -901,10 +901,6 @@
     @BrowserFeature(@WebBrowser(FF))
     JS_FUNCTION_TOSOURCE,
 
-    /** Indicates if the method 'toString' is enumerated. */
-    @BrowserFeature(@WebBrowser(CHROME))
-    JS_FUNCTION_TOSTRING_ENUMERATED,
-
     /** HTMLElement instead of HTMLUnknownElement for elements with hyphen ('-'). */
     @BrowserFeature({ @WebBrowser(FF), @WebBrowser(CHROME) })
     JS_HTML_HYPHEN_ELEMENT_CLASS_NAME,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/RecursiveFunctionObject.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/RecursiveFunctionObject.java	2016-03-04 09:24:48 UTC (rev 11998)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/RecursiveFunctionObject.java	2016-03-04 09:36:53 UTC (rev 11999)
@@ -14,7 +14,6 @@
  */
 package com.gargoylesoftware.htmlunit.javascript;
 
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_FUNCTION_TOSTRING_ENUMERATED;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_IMAGE_HTML_IMAGE_ELEMENT;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_INTL_V8_BREAK_ITERATOR;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OPTION_HTML_OPTION_ELEMENT;
@@ -62,9 +61,6 @@
         if (super.has(name, start)) {
             return true;
         }
-        if ("toString".equals(name) && getBrowserVersion().hasFeature(JS_FUNCTION_TOSTRING_ENUMERATED)) {
-            return true;
-        }
         for (Class<?> c = getMethodOrConstructor().getDeclaringClass().getSuperclass();
                 c != null; c = c.getSuperclass()) {
             final Object scripatble = getParentScope().get(c.getSimpleName(), this);
@@ -83,9 +79,6 @@
     @Override
     public Object[] getIds() {
         final Set<Object> objects = new LinkedHashSet<>();
-        if (getBrowserVersion().hasFeature(JS_FUNCTION_TOSTRING_ENUMERATED)) {
-            objects.add("toString");
-        }
         for (final Object o : super.getIds()) {
             objects.add(o);
         }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java	2016-03-04 09:24:48 UTC (rev 11998)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java	2016-03-04 09:36:53 UTC (rev 11999)
@@ -672,21 +672,14 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = { "prototype found", "" },
-            CHROME = { "prototype found", "toString, "
+    @Alerts(DEFAULT = { "prototype found", ""
                     + "ELEMENT_NODE, ATTRIBUTE_NODE, TEXT_NODE, CDATA_SECTION_NODE, ENTITY_REFERENCE_NODE, "
                     + "ENTITY_NODE, PROCESSING_INSTRUCTION_NODE, COMMENT_NODE, DOCUMENT_NODE, DOCUMENT_TYPE_NODE, "
                     + "DOCUMENT_FRAGMENT_NODE, NOTATION_NODE, DOCUMENT_POSITION_DISCONNECTED, "
                     + "DOCUMENT_POSITION_PRECEDING, "
                     + "DOCUMENT_POSITION_FOLLOWING, DOCUMENT_POSITION_CONTAINS, DOCUMENT_POSITION_CONTAINED_BY, "
                     + "DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC, " },
-            FF = { "prototype found", ""
-                    + "ELEMENT_NODE, ATTRIBUTE_NODE, TEXT_NODE, CDATA_SECTION_NODE, ENTITY_REFERENCE_NODE, "
-                    + "ENTITY_NODE, PROCESSING_INSTRUCTION_NODE, COMMENT_NODE, DOCUMENT_NODE, DOCUMENT_TYPE_NODE, "
-                    + "DOCUMENT_FRAGMENT_NODE, NOTATION_NODE, DOCUMENT_POSITION_DISCONNECTED, "
-                    + "DOCUMENT_POSITION_PRECEDING, "
-                    + "DOCUMENT_POSITION_FOLLOWING, DOCUMENT_POSITION_CONTAINS, DOCUMENT_POSITION_CONTAINED_BY, "
-                    + "DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC, " })
+            IE = { "prototype found", "" })
     public void enumeratedProperties() throws Exception {
         final String html
             = "<html><head>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java	2016-03-04 09:24:48 UTC (rev 11998)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java	2016-03-04 09:36:53 UTC (rev 11999)
@@ -1588,7 +1588,7 @@
     @Test
     @Alerts(DEFAULT = { "[object Window]", "[object Window]", "" },
             CHROME = { "[object Window]", "function Window() { [native code] }",
-            "toString, TEMPORARY, PERSISTENT, " },
+            "TEMPORARY, PERSISTENT, " },
             FF38 = { "[object Window]", "function Window() {\n    [native code]\n}", "" })
     public void enumeratedProperties() throws Exception {
         final String html

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java	2016-03-04 09:24:48 UTC (rev 11998)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java	2016-03-04 09:36:53 UTC (rev 11999)
@@ -284,7 +284,7 @@
      */
     @Test
     @Alerts(DEFAULT = { "[object HTMLBodyElement]", "" },
-        CHROME = { "function HTMLBodyElement() { [native code] }", "toString, "
+        CHROME = { "function HTMLBodyElement() { [native code] }", ""
             + "ELEMENT_NODE, ATTRIBUTE_NODE, TEXT_NODE, CDATA_SECTION_NODE, ENTITY_REFERENCE_NODE, "
             + "ENTITY_NODE, PROCESSING_INSTRUCTION_NODE, COMMENT_NODE, DOCUMENT_NODE, DOCUMENT_TYPE_NODE, "
             + "DOCUMENT_FRAGMENT_NODE, NOTATION_NODE, DOCUMENT_POSITION_DISCONNECTED, "