[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 8c5d88269108cd72612876cfd7c31956f21e06b1
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 24 23:09:26 2003 +0000

            Reviewed by John.
    
    	- fixed 3167642 - crash in renderArena.
    
            * khtml/html/html_documentimpl.h:
            * khtml/html/html_documentimpl.cpp:
            (HTMLDocumentImpl::HTMLDocumentImpl): Added new processingLoadEvent bool.
            (HTMLDocumentImpl::close): Guard against re-entering the load event handler.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3692 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9d8ca54..d563a68 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-02-24  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3167642 - crash in renderArena.
+	
+        * khtml/html/html_documentimpl.h:
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::HTMLDocumentImpl): Added new processingLoadEvent bool.
+        (HTMLDocumentImpl::close): Guard against re-entering the load event handler.
+
 2003-02-24  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9d8ca54..d563a68 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-02-24  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3167642 - crash in renderArena.
+	
+        * khtml/html/html_documentimpl.h:
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::HTMLDocumentImpl): Added new processingLoadEvent bool.
+        (HTMLDocumentImpl::close): Guard against re-entering the load event handler.
+
 2003-02-24  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index 61f5cc8..39c20c6 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -122,6 +122,8 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTML
     connect( KHTMLFactory::vLinks(), SIGNAL( cleared()),
              SLOT( slotHistoryChanged() ));
     m_startTime.restart();
+
+    processingLoadEvent = false;
 }
 
 HTMLDocumentImpl::~HTMLDocumentImpl()
@@ -330,14 +332,16 @@ HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
 void HTMLDocumentImpl::close()
 {
     // First fire the onload.
-    bool doload = !parsing() && m_tokenizer;
+    bool doload = !parsing() && m_tokenizer && !processingLoadEvent;
     
     bool wasNotRedirecting = !view() || view()->part()->d->m_scheduledRedirection == noRedirectionScheduled;
-    
+
+    processingLoadEvent = true;
     if (body() && doload) {
         dispatchImageLoadEventsNow();
         body()->dispatchWindowEvent(EventImpl::LOAD_EVENT, false, false);
     }
+    processingLoadEvent = false;
         
     // Make sure both the initial layout and reflow happen after the onload
     // fires. This will improve onload scores, and other browsers do it.
diff --git a/WebCore/khtml/html/html_documentimpl.h b/WebCore/khtml/html/html_documentimpl.h
index 65b5a0a..2c57aba 100644
--- a/WebCore/khtml/html/html_documentimpl.h
+++ b/WebCore/khtml/html/html_documentimpl.h
@@ -103,6 +103,7 @@ private:
     // we actually store ints inside the pointer value itself; would use void *
     // but that makes the template unhappy.
     QDict<char> namedImageAndFormCounts;
+    bool processingLoadEvent;
 
 #if APPLE_CHANGES
     DOMString m_policyBaseURL;

-- 
WebKit Debian packaging