[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 2a58f2aa9b7a3d30c743b792e815f5262dee4a26
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 19 09:33:48 2002 +0000

            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge installInFrame:]): Assert that this bridge is
    	either for the main frame, or that it's frame has a render
    	part. If neither of these conditions is met, the view will never
    	get installed in the view hiearchy leading to nasty silent
    	failure; and this condition should be guaranteed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5edaf39..487355e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-07-19  Maciej Stachowiak  <mjs at apple.com>
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge installInFrame:]): Assert that this bridge is
+	either for the main frame, or that it's frame has a render
+	part. If neither of these conditions is met, the view will never
+	get installed in the view hiearchy leading to nasty silent
+	failure; and this condition should be guaranteed.
+
 2002-07-18  David Hyatt  <hyatt at apple.com>
 
         * khtml/css/css_valueimpl.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5edaf39..487355e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-07-19  Maciej Stachowiak  <mjs at apple.com>
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge installInFrame:]): Assert that this bridge is
+	either for the main frame, or that it's frame has a render
+	part. If neither of these conditions is met, the view will never
+	get installed in the view hiearchy leading to nasty silent
+	failure; and this condition should be guaranteed.
+
 2002-07-18  David Hyatt  <hyatt at apple.com>
 
         * khtml/css/css_valueimpl.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5edaf39..487355e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-07-19  Maciej Stachowiak  <mjs at apple.com>
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge installInFrame:]): Assert that this bridge is
+	either for the main frame, or that it's frame has a render
+	part. If neither of these conditions is met, the view will never
+	get installed in the view hiearchy leading to nasty silent
+	failure; and this condition should be guaranteed.
+
 2002-07-18  David Hyatt  <hyatt at apple.com>
 
         * khtml/css/css_valueimpl.cpp:
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index dbff65a..443f1dd 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -32,6 +32,7 @@
 #import <dom_docimpl.h>
 #import <render_root.h>
 #import <render_frames.h>
+#import <kwqdebug.h>
 #include <html/html_documentimpl.h>
 #include <xml/dom_nodeimpl.h>
 
@@ -262,6 +263,11 @@
     part->impl->getView()->setView(view);
 
     KHTMLRenderPart *renderPart = [[self frame] renderPart];
+
+    // If this isn't the main frame, it must have a render part set, or it
+    // won't ever get installed in the view hierarchy.
+    KWQ_ASSERT([self frame] == [self mainFrame] || renderPart != nil);
+
     if (renderPart) {
         renderPart->setWidget(part->impl->getView());
         // Now that the render part is holding the widget, we don't own it any more.

-- 
WebKit Debian packaging