[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 1a418d9c9a22c5f8f55c679001acb422bb59b74c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 16 02:42:31 2002 +0000

    	Fix for 3057974 and 3128713.  I needed to make frames check to
    	see if their parentNode had a renderer to complete the FOUC
    	fix.  Completing the FOUC fix finally solves 3057974.
    
            Reviewed by darin
    
            * khtml/html/html_baseimpl.cpp:
            (HTMLFrameElementImpl::attach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3069 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0bf5e54..db37fd1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-12-15  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3057974 and 3128713.  I needed to make frames check to
+	see if their parentNode had a renderer to complete the FOUC
+	fix.  Completing the FOUC fix finally solves 3057974.
+	
+        Reviewed by darin
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLFrameElementImpl::attach):
+
+2002-12-15  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3109226, epinions page is mostly blank.  Add a hack
 	to disallow > but only inside attribute values for which there
 	is no corresponding attribute name.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0bf5e54..db37fd1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-12-15  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3057974 and 3128713.  I needed to make frames check to
+	see if their parentNode had a renderer to complete the FOUC
+	fix.  Completing the FOUC fix finally solves 3057974.
+	
+        Reviewed by darin
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLFrameElementImpl::attach):
+
+2002-12-15  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3109226, epinions page is mostly blank.  Add a hack
 	to disallow > but only inside attribute values for which there
 	is no corresponding attribute name.
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 1dadef5..32189b0 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -296,8 +296,7 @@ void HTMLFrameElementImpl::attach()
 {
     assert(!attached());
     assert(parentNode());
-    assert(parentNode()->renderer());
-
+    
     // ignore display: none for this element!
     KHTMLView* w = getDocument()->view();
     // avoid endless recursion
@@ -310,7 +309,7 @@ void HTMLFrameElementImpl::attach()
             break;
         }
 
-    if (!selfreference)  {
+    if (!selfreference && parentNode()->renderer())  {
         m_render = new (getDocument()->renderArena()) RenderFrame(this);
         m_render->setStyle(getDocument()->styleSelector()->styleForElement(this));
         parentNode()->renderer()->addChild(m_render, nextRenderer());

-- 
WebKit Debian packaging