Reviewed by Darin.

	<rdar://problem/3771426> assertion failed due to reentering dispatchImageLoadEventsNow

	* khtml/xml/dom_docimpl.cpp:
        (DocumentImpl::dispatchImageLoadEventsNow): Avoid re-entering this
	function, since it uses a data member for the copy of the list of events
	to be dispatched.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7324 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7790aba52a61e86f1eb89851446577ae9fbe67ef..0233bd5037793e1f1d72ddd66833528dd10344dd 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-08-23  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+       <rdar://problem/3771426> assertion failed due to reentering dispatchImageLoadEventsNow
+        
+       * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::dispatchImageLoadEventsNow): Avoid re-entering this
+       function, since it uses a data member for the copy of the list of events
+       to be dispatched.
+
 2004-08-23  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 59fb7c14a625a11b752afc733dc7d80a0952cd07..7d56c88ccc9f3d187a485a7e2a68ddb6e7191d3c 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -2614,6 +2614,13 @@ void DocumentImpl::removeImage(HTMLImageLoader* image)
 
 void DocumentImpl::dispatchImageLoadEventsNow()
 {
+    // need to avoid re-entering this function; if new dispatches are
+    // scheduled before the parent finishes processing the list, they
+    // will set a timer and eventually be processed
+    if (!m_imageLoadEventDispatchingList.isEmpty()) {
+        return;
+    }
+
     if (m_imageLoadEventTimer) {
         killTimer(m_imageLoadEventTimer);
         m_imageLoadEventTimer = 0;