Commit a02ae6d8 authored by darin's avatar darin

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
parent 8724c85b
2002-12-24 Darin Adler <darin@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@apple.com>
......
2002-12-24 Darin Adler <darin@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@apple.com>
......
......@@ -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());
}
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment