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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit a05cb555dc44d9666b7c97496df03bac791e80d3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 23 07:34:35 2002 +0000

            * khtml/html/html_objectimpl.cpp:
            (HTMLObjectElementImpl::attach):
    	Oops.  I accidentally removed the call to an ancestor class
    	attach function.  What made this subtle is that it deliberately
    	skipped over a couple of base classes and called the one three
    	superclasses up.  When I went to put it back in, I messed up
    	and called the base class instead of the distant ancestor.
    
    	Silly me.  marvel.com and matadorrecords.com should be ok now.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e871e32..7c83830 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLObjectElementImpl::attach):
+	Oops.  I accidentally removed the call to an ancestor class
+	attach function.  What made this subtle is that it deliberately
+	skipped over a couple of base classes and called the one three
+	superclasses up.  When I went to put it back in, I messed up
+	and called the base class instead of the distant ancestor.  
+
+	Silly me.  marvel.com and matadorrecords.com should be ok now.
+	
 2002-07-22  Darin Adler  <darin at apple.com>
 
         * khtml/rendering/render_text.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e871e32..7c83830 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLObjectElementImpl::attach):
+	Oops.  I accidentally removed the call to an ancestor class
+	attach function.  What made this subtle is that it deliberately
+	skipped over a couple of base classes and called the one three
+	superclasses up.  When I went to put it back in, I messed up
+	and called the base class instead of the distant ancestor.  
+
+	Silly me.  marvel.com and matadorrecords.com should be ok now.
+	
 2002-07-22  Darin Adler  <darin at apple.com>
 
         * khtml/rendering/render_text.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e871e32..7c83830 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLObjectElementImpl::attach):
+	Oops.  I accidentally removed the call to an ancestor class
+	attach function.  What made this subtle is that it deliberately
+	skipped over a couple of base classes and called the one three
+	superclasses up.  When I went to put it back in, I messed up
+	and called the base class instead of the distant ancestor.  
+
+	Silly me.  marvel.com and matadorrecords.com should be ok now.
+	
 2002-07-22  Darin Adler  <darin at apple.com>
 
         * khtml/rendering/render_text.cpp:
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index 026f914..c65ddc7 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -360,10 +360,14 @@ void HTMLObjectElementImpl::attach()
         parentNode()->renderer()->addChild(m_render, nextRenderer());
     }
 
+    NodeBaseImpl::attach();
+
     // Go ahead and perform the update.
-    if (m_childrenLoaded && m_render && strcmp(m_render->renderName(), "RenderPartObject") == 0)
+    if (m_childrenLoaded && m_render && strcmp(m_render->renderName(), "RenderPartObject") == 0) {
+        m_childrenLoaded = false;
         static_cast<RenderPartObject*>(m_render)->updateWidget();
-    
+    }
+
     // ### do this when we are actually finished loading instead
     dispatchHTMLEvent(EventImpl::LOAD_EVENT,false,false);
 }

-- 
WebKit Debian packaging