Changeset 5404 in webkit

Timestamp:

Nov 6, 2003, 9:12:28 AM (21 years ago)

Author:

mjs

Message:

Reviewed by Darin.

• fixed 3475366 - 4.5% of time spent making html event listeners on slow intel page.

6% speedup on intel page, 1% speedup on cvs-base PLT.

• khtml/ecma/kjs_events.cpp: (JSEventListener::JSEventListener): Don't add self to hashtable if imp is null (which can now happen in the lazy listener case). (JSEventListener::~JSEventListener): Ditto on removing. (JSEventListener::listenerObj): Made this virtual. (JSLazyEventListener::JSLazyEventListener): New constructor. (JSLazyEventListener::handleEvent): call parseCode, then superclass if it appeared to succeed. (JSLazyEventListener::listenerObj): call parseCode, then superclass. (JSLazyEventListener::parseCode): (KJS::getNodeEventListener): Check for null listenerObjImp in case of lazy listener that failed to parse.
• khtml/ecma/kjs_dom.cpp: (DOMNode::getListener): Ditto.
• khtml/ecma/kjs_html.cpp: (Image::getValueProperty): Ditto.
• khtml/ecma/kjs_events.h: (KJS::JSEventListener::listenerObjImp): call listenerObj() virtual method and get imp from the result.
• khtml/ecma/kjs_proxy.cpp: (KJSProxyImpl::createHTMLEventHandler): Don't parse the code here, make a lazy listener.
• khtml/ecma/kjs_window.cpp: (Window::getJSLazyEventListener): make a new JSLazyEventListener - no need to check the listeners hashtable cause a brand new lazy listener won't have a function anyway.
• khtml/ecma/kjs_window.h: Prototype new method.

Location:

trunk/WebCore

Files:

• ChangeLog-2005-08-23 (modified) (1 diff)
• khtml/ecma/kjs_dom.cpp (modified) (1 diff)
• khtml/ecma/kjs_events.cpp (modified) (3 diffs)
• khtml/ecma/kjs_events.h (modified) (1 diff)
• khtml/ecma/kjs_html.cpp (modified) (1 diff)
• khtml/ecma/kjs_proxy.cpp (modified) (1 diff)
• khtml/ecma/kjs_window.cpp (modified) (1 diff)
• khtml/ecma/kjs_window.h (modified) (2 diffs)
• khtml/xml/dom_docimpl.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog-2005-08-23

@@ +1 @@
+2003-11-06  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+        - fixed 3475366 - 4.5% of time spent making html event listeners on slow intel page.
+
+        6% speedup on intel page, 1% speedup on cvs-base PLT.
+        
+        * khtml/ecma/kjs_events.cpp:
+        (JSEventListener::JSEventListener): Don't add self to hashtable if imp is null (which
+        can now happen in the lazy listener case).
+        (JSEventListener::~JSEventListener): Ditto on removing.
+        (JSEventListener::listenerObj): Made this virtual.
+        (JSLazyEventListener::JSLazyEventListener): New constructor.
+        (JSLazyEventListener::handleEvent): call parseCode, then
+        superclass if it appeared to succeed.
+        (JSLazyEventListener::listenerObj): call parseCode, then superclass.
+        (JSLazyEventListener::parseCode):
+        (KJS::getNodeEventListener): Check for null listenerObjImp in case of
+        lazy listener that failed to parse.
+        * khtml/ecma/kjs_dom.cpp:
+        (DOMNode::getListener): Ditto.
+        * khtml/ecma/kjs_html.cpp:
+        (Image::getValueProperty): Ditto.
+        * khtml/ecma/kjs_events.h:
+        (KJS::JSEventListener::listenerObjImp): call listenerObj() virtual
+        method and get imp from the result.
+        * khtml/ecma/kjs_proxy.cpp:
+        (KJSProxyImpl::createHTMLEventHandler): Don't parse the code here, make a lazy
+        listener.
+        * khtml/ecma/kjs_window.cpp:
+        (Window::getJSLazyEventListener): make a new JSLazyEventListener - no need
+        to check the listeners hashtable cause a brand new lazy listener won't have
+        a function anyway.
+        * khtml/ecma/kjs_window.h: Prototype new method.
+
 2003-11-06  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/khtml/ecma/kjs_dom.cpp

@@ -416 +416 @@
 {
     DOM::EventListener *listener = node.handle()->getHTMLEventListener(eventId);
-    if (listener)
-        return static_cast<JSEventListener*>(listener)->listenerObj();
+    JSEventListener *jsListener = static_cast<JSEventListener*>(listener);
+    if ( jsListener && jsListener->listenerObjImp() )
+        return jsListener->listenerObj();
     else
         return Null();

trunk/WebCore/khtml/ecma/kjs_events.cpp

@@ -44 +44 @@
     html = _html;
     win = _win;
-    static_cast<Window*>(win.imp())->jsEventListeners.insert(_listener.imp(), this);
+    if (_listener.imp()) {
+      static_cast<Window*>(win.imp())->jsEventListeners.insert(_listener.imp(), this);
+    }
 }
 
 JSEventListener::~JSEventListener()
 {
-    static_cast<Window*>(win.imp())->jsEventListeners.remove(listener.imp());
+    if (listener.imp()) {
+      static_cast<Window*>(win.imp())->jsEventListeners.remove(listener.imp());
+    }
     //fprintf(stderr,"JSEventListener::~JSEventListener this=%p listener=%p\n",this,listener.imp());
 }
@@ -60 +64 @@
 #endif
   KHTMLPart *part = static_cast<Window*>(win.imp())->part();
-  KJSProxy *proxy = 0L;
+  KJSProxy *proxy = 0;
   if (part)
       proxy = KJSProxy::proxy( part );
@@ -132 +136 @@
 }
 
+
+Object JSEventListener::listenerObj() const
+{ 
+  return listener; 
+}
+
+JSLazyEventListener::JSLazyEventListener(QString _code, const Object &_win, bool _html)
+  : JSEventListener(Object(), _win, _html),
+    code(_code),
+    parsed(false)
+{
+}
+
+void JSLazyEventListener::handleEvent(DOM::Event &evt, bool isWindowEvent)
+{
+  parseCode();
+  if (!listener.isNull()) {
+    JSEventListener::handleEvent(evt, isWindowEvent);
+  }
+}
+
+
+Object JSLazyEventListener::listenerObj() const
+{
+  parseCode();
+  return listener;
+}
+
+void JSLazyEventListener::parseCode() const
+{
+  if (!parsed) {
+    KHTMLPart *part = static_cast<Window*>(win.imp())->part();
+    KJSProxy *proxy = 0L;
+    if (part)
+      proxy = KJSProxy::proxy( part );
+
+    if (proxy) {
+      KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(proxy->interpreter());
+      ExecState *exec = interpreter->globalExec();
+
+      //KJS::Constructor constr(KJS::Global::current().get("Function").imp());
+      KJS::Object constr = interpreter->builtinFunction();
+      KJS::List args;
+
+      static KJS::String eventString("event");
+
+      args.append(eventString);
+      args.append(KJS::String(code));
+      listener = constr.construct(exec, args); // ### is globalExec ok ?
+      
+      if ( exec->hadException() ) {
+        exec->clearException();
+
+        // failed to parse, so let's just make this listener a no-op
+        listener = Object();
+      }
+    }
+
+    // no more need to keep the unparsed code around
+    code = QString();
+    
+    if (!listener.isNull()) {
+      static_cast<Window*>(win.imp())->jsEventListeners.insert(listener.imp(), 
+                                                               (KJS::JSEventListener *)(this));
+    }
+    
+    parsed = true;
+  }
+}
+
 Value KJS::getNodeEventListener(DOM::Node n, int eventId)
 {
     DOM::EventListener *listener = n.handle()->getHTMLEventListener(eventId);
-    if (listener)
-        return static_cast<JSEventListener*>(listener)->listenerObj();
+    JSEventListener *jsListener = static_cast<JSEventListener*>(listener);
+    if ( jsListener && jsListener->listenerObjImp() )
+        return jsListener->listenerObj();
     else
         return Null();
 }
+
+
 
 // -------------------------------------------------------------------------

trunk/WebCore/khtml/ecma/kjs_events.h

@@ -37 +37 @@
     virtual void handleEvent(DOM::Event &evt, bool isWindowEvent);
     virtual DOM::DOMString eventListenerType();
-    Object listenerObj() const { return listener; }
-    ObjectImp *listenerObjImp() const { return listener.imp(); }
+    virtual Object listenerObj() const;
+    ObjectImp *listenerObjImp() const { return listenerObj().imp(); }
   protected:
-    Object listener;
+    mutable Object listener;
     bool html;
     Object win;
   };
+
+  class JSLazyEventListener : public JSEventListener {
+  public:
+    JSLazyEventListener(QString _code, const Object &_win, bool _html = false);
+    virtual void handleEvent(DOM::Event &evt, bool isWindowEvent);
+    Object listenerObj() const;
+  private:
+    void parseCode() const;
+    
+    mutable QString code;
+    mutable bool parsed;
+  };
+
 
   Value getNodeEventListener(DOM::Node n, int eventId);

trunk/WebCore/khtml/ecma/kjs_html.cpp

@@ -3186 +3186 @@
     return Boolean(!img || img->status() >= khtml::CachedObject::Persistent);
   case OnLoad:
-    if (onLoadListener) {
+    if (onLoadListener && onLoadListener->listenerObjImp()) {
       return onLoadListener->listenerObj();
     } else {

trunk/WebCore/khtml/ecma/kjs_proxy.cpp

@@ -165 +165 @@
 
   initScript();
-  //KJS::Constructor constr(KJS::Global::current().get("Function").imp());
-  KJS::Object constr = m_script->builtinFunction();
-  KJS::List args;
-  args.append(KJS::String("event"));
-  args.append(KJS::String(code));
-  Object handlerFunc = constr.construct(m_script->globalExec(), args); // ### is globalExec ok ?
-
-  return KJS::Window::retrieveWindow(m_part)->getJSEventListener(handlerFunc,true);
+
+  return KJS::Window::retrieveWindow(m_part)->getJSLazyEventListener(code,true);
 }
 

trunk/WebCore/khtml/ecma/kjs_window.cpp

@@ -1033 +1033 @@
 }
 
+JSLazyEventListener *Window::getJSLazyEventListener(const QString& code, bool html)
+{
+  return new JSLazyEventListener(code, Object(this), html);
+}
+
 void Window::clear( ExecState *exec )
 {

trunk/WebCore/khtml/ecma/kjs_window.h

@@ -42 +42 @@
   class FrameArray;
   class JSEventListener;
+  class JSLazyEventListener;
 
   class Screen : public ObjectImp {
@@ -101 +102 @@
     Location *location() const;
     JSEventListener *getJSEventListener(const Value &val, bool html = false);
+    JSLazyEventListener *getJSLazyEventListener(const QString &code, bool html = false);
     void clear( ExecState *exec );
     virtual UString toString(ExecState *exec) const;

trunk/WebCore/khtml/xml/dom_docimpl.cpp

@@ -2397 +2397 @@
 QString DocumentImpl::completeURL(const QString &URL)
 {
-    return KURL(baseURL(), URL, m_decoder ? m_decoder->codec() : 0).url();
+*    return KURL(baseURL(), URL, m_decoder ? m_decoder->codec() : 0).url();
 }