move some work to the initial setup - hopefully this improves window setup speed

Author: rbri

src/main/java/org/htmlunit/javascript/JavaScriptEngine.java

@@ -46,6 +46,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.FunctionObject;
 import org.htmlunit.corejs.javascript.JavaScriptException;
+import org.htmlunit.corejs.javascript.MemberBox;
 import org.htmlunit.corejs.javascript.NativeArray;
 import org.htmlunit.corejs.javascript.NativeArrayIterator;
 import org.htmlunit.corejs.javascript.NativeConsole;
@@ -608,24 +609,24 @@ private static void configureProperties(final ClassConfiguration config, final S
         if (propertyMap != null) {
             for (final Entry<String, PropertyInfo> propertyEntry : propertyMap.entrySet()) {
                 final PropertyInfo info = propertyEntry.getValue();
-                final Method readMethod = info.getReadMethod();
-                final Method writeMethod = info.getWriteMethod();
-                scriptable.defineProperty(propertyEntry.getKey(), null, readMethod, writeMethod, ScriptableObject.EMPTY);
+                final MemberBox readMethod = info.getReadMethod();
+                final MemberBox writeMethod = info.getWriteMethod();
+                scriptable.defineProperty(propertyEntry.getKey(), readMethod, writeMethod, ScriptableObject.EMPTY);
             }
         }
     }
 
     private static void configureStaticProperties(final ClassConfiguration config, final ScriptableObject scriptable) {
         final Map<String, PropertyInfo> staticPropertyMap = config.getStaticPropertyMap();
         if (staticPropertyMap != null) {
-            for (final Entry<String, ClassConfiguration.PropertyInfo> propertyEntry : staticPropertyMap.entrySet()) {
-                final String propertyName = propertyEntry.getKey();
-                final Method readMethod = propertyEntry.getValue().getReadMethod();
-                final Method writeMethod = propertyEntry.getValue().getWriteMethod();
-                final int flag = ScriptableObject.EMPTY;
-
-                scriptable.defineProperty(propertyName, null, readMethod, writeMethod, flag);
-            }
+//            for (final Entry<String, ClassConfiguration.PropertyInfo> propertyEntry : staticPropertyMap.entrySet()) {
+//                final String propertyName = propertyEntry.getKey();
+//                final Method readMethod = propertyEntry.getValue().getReadMethod();
+//                final Method writeMethod = propertyEntry.getValue().getWriteMethod();
+//                final int flag = ScriptableObject.EMPTY;
+//
+//                scriptable.defineProperty(propertyName, null, readMethod, writeMethod, flag);
+//            }
         }
     }
 

src/main/java/org/htmlunit/javascript/configuration/ClassConfiguration.java

@@ -22,8 +22,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.htmlunit.corejs.javascript.MemberBox;
 import org.htmlunit.corejs.javascript.ScriptableObject;
 import org.htmlunit.corejs.javascript.Symbol;
+import org.htmlunit.corejs.javascript.lc.type.TypeInfoFactory;
 import org.htmlunit.javascript.HtmlUnitScriptable;
 
 /**
@@ -313,8 +315,8 @@ public String getClassName() {
      * methods that implement the get and set functions.
      */
     public static class PropertyInfo {
-        private final Method readMethod_;
-        private final Method writeMethod_;
+        private final MemberBox readMethod_;
+        private final MemberBox writeMethod_;
 
         /**
          * Constructor.
@@ -323,21 +325,30 @@ public static class PropertyInfo {
          * @param writeMethod the writeMethod
          */
         public PropertyInfo(final Method readMethod, final Method writeMethod) {
-            readMethod_ = readMethod;
-            writeMethod_ = writeMethod;
+            MemberBox getterBox = null;
+            if (readMethod != null) {
+                getterBox = new MemberBox(readMethod, TypeInfoFactory.GLOBAL);
+            }
+            readMethod_ = getterBox;
+
+            MemberBox setterBox = null;
+            if (writeMethod != null) {
+                setterBox = new MemberBox(writeMethod, TypeInfoFactory.GLOBAL);
+            }
+            writeMethod_ = setterBox;
         }
 
         /**
          * @return the readMethod
          */
-        public Method getReadMethod() {
+        public MemberBox getReadMethod() {
             return readMethod_;
         }
 
         /**
          * @return the writeMethod
          */
-        public Method getWriteMethod() {
+        public MemberBox getWriteMethod() {
             return writeMethod_;
         }
     }