[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.2/kdelibs/khtml/html
From:       Maks Orlovich <maksim () kde ! org>
Date:       2009-02-09 22:00:52
Message-ID: 1234216852.804167.5635.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 924023 by orlovich:

<frameset onload=> should set a window event listener, not a DOM one.
Fixes #183455 (http://www.fixprotocol.org/FIXimate3.0/)
We can also remove the special memory management stuff here, since we're no longer
captured.


 M  +4 -16     html_baseimpl.cpp  


--- branches/KDE/4.2/kdelibs/khtml/html/html_baseimpl.cpp #924022:924023
@@ -542,22 +542,10 @@
     noresize = false;
 
     m_resizing = false;
-
-    m_onLoad = m_onUnLoad = 0;
 }
 
 HTMLFrameSetElementImpl::~HTMLFrameSetElementImpl()
 {
-    //### this is likely not quite right since we may be effectively "overriding" some old value,
-    //which needs to be recomputed, but this is better than crashing...
-    if (document()) {
-        if (m_onLoad && document()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
-            document()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
-
-        if (m_onUnLoad && document()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
-            document()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
-    }
-
     delete [] m_rows;
     delete [] m_cols;
 }
@@ -600,12 +588,12 @@
             frameborder = false;
         break;
     case ATTR_ONLOAD:
-        m_onLoad = document()->createHTMLEventListener(attr->value().string(), "onload", this);
-        document()->setHTMLEventListener(EventImpl::LOAD_EVENT, m_onLoad);
+        document()->setHTMLWindowEventListener(EventImpl::LOAD_EVENT,
+            document()->createHTMLEventListener(attr->value().string(), "onload", NULL));
         break;
     case ATTR_ONUNLOAD:
-        m_onUnLoad = document()->createHTMLEventListener(attr->value().string(), "onunload", this);
-        document()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, m_onUnLoad);
+        document()->setHTMLWindowEventListener(EventImpl::UNLOAD_EVENT,
+            document()->createHTMLEventListener(attr->value().string(), "onunload", NULL));
         break;
     default:
         HTMLElementImpl::parseAttribute(attr);
[prev in list] [next in list] [prev in thread] [next in thread]