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

[darin]

The following commit has been merged in the debian/unstable branch:
commit a02ae6d8e9e41cf2d2a92c6081f8cb8235e85f0f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 24 19:48:52 2002 +0000

            Reviewed by Richard and Don.
    
    	- fixed 3133207 -- crash in HTMLFrameElementImpl updateForNewURL at home.real.com
    
    	My previous attempt to fix this dealt with the case where a RenderFrame object was
    	not yet created, but not with the case where a RenderFrame object was created without
    	a corresponding part. Somehow I overlooked this last time when I was doing testing.
    	Testing this time confirms this takes care of the remaining problem at movies.real.com.
    
            * khtml/html/html_baseimpl.cpp: (HTMLFrameElementImpl::updateForNewURL):
    	Use the same kind of requestFrame call here as in attach when there's a RenderFrame,
    	but no corresponding part. Maybe we can fix this an even more elegant way later.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3183 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a7b2a8d..c74740c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-12-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Richard and Don.
+
+	- fixed 3133207 -- crash in HTMLFrameElementImpl updateForNewURL at home.real.com
+
+	My previous attempt to fix this dealt with the case where a RenderFrame object was
+	not yet created, but not with the case where a RenderFrame object was created without
+	a corresponding part. Somehow I overlooked this last time when I was doing testing.
+	Testing this time confirms this takes care of the remaining problem at movies.real.com.
+
+        * khtml/html/html_baseimpl.cpp: (HTMLFrameElementImpl::updateForNewURL):
+	Use the same kind of requestFrame call here as in attach when there's a RenderFrame,
+	but no corresponding part. Maybe we can fix this an even more elegant way later.
+
 === Alexander-45 ===
 
 2002-12-23  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a7b2a8d..c74740c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-12-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Richard and Don.
+
+	- fixed 3133207 -- crash in HTMLFrameElementImpl updateForNewURL at home.real.com
+
+	My previous attempt to fix this dealt with the case where a RenderFrame object was
+	not yet created, but not with the case where a RenderFrame object was created without
+	a corresponding part. Somehow I overlooked this last time when I was doing testing.
+	Testing this time confirms this takes care of the remaining problem at movies.real.com.
+
+        * khtml/html/html_baseimpl.cpp: (HTMLFrameElementImpl::updateForNewURL):
+	Use the same kind of requestFrame call here as in attach when there's a RenderFrame,
+	but no corresponding part. Maybe we can fix this an even more elegant way later.
+
 === Alexander-45 ===
 
 2002-12-23  Darin Adler  <darin at apple.com>
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 0ad6ed5..fef36fe 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -240,6 +240,7 @@ void HTMLFrameElementImpl::updateForNewURL()
         // The following is repeated logic from attach(). We should share the code instead.
         
 	KHTMLView* w = getDocument()->view();
+        
 	// avoid endless recursion
 	KURL u;
 	if (!url.isEmpty()) u = getDocument()->completeURL( url.string() );
@@ -255,7 +256,11 @@ void HTMLFrameElementImpl::updateForNewURL()
 	// load the frame contents
 	if ( !url.isEmpty() && !(w->part()->onlyLocalReferences() && u.protocol() != "file")) {
 	    KHTMLPart *part = w->part()->findFrame( name.string() );
-	    part->openURL(u);
+	    if (part) {
+                part->openURL(u);
+            } else {
+                w->part()->requestFrame(static_cast<RenderFrame*>(m_render), url.string(), name.string());
+            }
 	}
     }
 }

-- 
WebKit Debian packaging