Reviewed by John.

        - added a bunch of missing nil checks; our old version of inherits used to work for nil (by accident)

        * khtml/rendering/render_frames.cpp:
        (RenderPart::~RenderPart): Check widget for nil.
        (RenderPart::setWidget): Ditto.
        (RenderFrame::slotViewCleared): Ditto.
        (RenderPartObject::slotViewCleared): Ditto.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 884b65f9d763c879d8f7c36bbac9b4ebfa0b3ba6..cadc3176bbf874da08c7589373fb1d666a4f26bc 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-12-14  Darin Adler  <darin@apple.com>
+
+        Reviewed by John.
+
+        - added a bunch of missing nil checks; our old version of inherits used to work for nil (by accident)
+
+        * khtml/rendering/render_frames.cpp:
+        (RenderPart::~RenderPart): Check widget for nil.
+        (RenderPart::setWidget): Ditto.
+        (RenderFrame::slotViewCleared): Ditto.
+        (RenderPartObject::slotViewCleared): Ditto.
+
 2004-12-13  Darin Adler  <darin@apple.com>
 
         Reviewed by Ken.

diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 387821db1b8834ef505f1226fc9af81da94f01f7..1c9589bbf324124f9d6a179174f9a7a24d4409f7 100644 (file)
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
- * Copyright (C) 2003 Apple Computer, Inc.
+ * Copyright (C) 2004 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -574,7 +574,7 @@ RenderPart::RenderPart(DOM::HTMLElementImpl* node)
 
 RenderPart::~RenderPart()
 {
-    if(m_widget->inherits("KHTMLView")) {
+    if (m_widget && m_widget->inherits("KHTMLView")) {
        static_cast<KHTMLView *>(m_widget)->deref();
     }
 }
@@ -589,11 +589,11 @@ void RenderPart::setWidget( QWidget *widget )
        return;
     }
 
-    if(m_widget->inherits("KHTMLView")) {
+    if (m_widget && m_widget->inherits("KHTMLView")) {
        static_cast<KHTMLView *>(m_widget)->deref();
     }
     
-    if(widget->inherits("KHTMLView")) {        
+    if (widget && widget->inherits("KHTMLView")) {     
        static_cast<KHTMLView *>(widget)->ref();
        setQWidget( widget, false );
        connect( widget, SIGNAL( cleared() ), this, SLOT( slotViewCleared() ) );
@@ -646,7 +646,7 @@ RenderFrame::RenderFrame( DOM::HTMLFrameElementImpl *frame )
 
 void RenderFrame::slotViewCleared()
 {
-    if(element() && m_widget->inherits("QScrollView")) {
+    if (element() && m_widget && m_widget->inherits("QScrollView")) {
 #ifdef DEBUG_LAYOUT
         kdDebug(6031) << "frame is a scrollview!" << endl;
 #endif
@@ -966,7 +966,7 @@ void RenderPartObject::layout( )
 
 void RenderPartObject::slotViewCleared()
 {
-  if(element() && m_widget->inherits("QScrollView") ) {
+  if(element() && m_widget && m_widget->inherits("QScrollView") ) {
 #ifdef DEBUG_LAYOUT
       kdDebug(6031) << "iframe is a scrollview!" << endl;
 #endif