[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 2527fad24324e5a398b495b8eb07c11ed10ec360
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 30 18:39:03 2003 +0000

    	Fix for 3437260, nil deref of the render style because it hasn't been set yet.
    	Fallout from my incremental repainting landing.
    
            Reviewed by darin
    
            * khtml/rendering/render_replaced.cpp:
            (RenderWidget::setQWidget):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c8a0376..0ea1731 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-09-30  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3437260, nil deref of the render style because it hasn't been set yet.
+	Fallout from my incremental repainting landing.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_replaced.cpp:
+        (RenderWidget::setQWidget):
+
 2003-09-29  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3438479, tables expand on every layout when a cell has percentage height
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c8a0376..0ea1731 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-09-30  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3437260, nil deref of the render style because it hasn't been set yet.
+	Fallout from my incremental repainting landing.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_replaced.cpp:
+        (RenderWidget::setQWidget):
+
 2003-09-29  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3438479, tables expand on every layout when a cell has percentage height
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index a8d67f4..a762633 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -190,8 +190,9 @@ void RenderWidget::setQWidget(QWidget *widget, bool deleteWidget)
             connect( m_widget, SIGNAL( destroyed()), this, SLOT( slotWidgetDestructed()));
             m_widget->installEventFilter(this);
             // if we've already received a layout, apply the calculated space to the
-            // widget immediately
-            if (!needsLayout()) {
+            // widget immediately, but we have to have really been full constructed (with a non-null
+            // style pointer).
+            if (!needsLayout() && style()) {
 		resizeWidget( m_widget,
 			      m_width-borderLeft()-borderRight()-paddingLeft()-paddingRight(),
 			      m_height-borderLeft()-borderRight()-paddingLeft()-paddingRight() );

-- 
WebKit Debian packaging