You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1.2 KiB
26 lines
1.2 KiB
Index: khtml_part.cpp
|
|
===================================================================
|
|
RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
|
|
retrieving revision 1.1015.2.12
|
|
diff -u -p -r1.1015.2.12 khtml_part.cpp
|
|
--- ./khtml/khtml_part.cpp 17 Nov 2004 13:46:56 -0000 1.1015.2.12
|
|
+++ ./khtml/khtml_part.cpp 12 Dec 2004 15:55:30 -0000
|
|
@@ -4758,7 +4758,7 @@ KHTMLPart *
|
|
KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
|
|
{
|
|
#ifdef DEBUG_FINDFRAME
|
|
- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
|
|
+ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
|
|
#endif
|
|
// Check access
|
|
KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
|
|
@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read
|
|
if (!checkFrameAccess(callingHtmlPart))
|
|
return 0;
|
|
|
|
+ if (!childFrame && !parentPart() && (name() == f))
|
|
+ return this;
|
|
+
|
|
FrameIt it = d->m_frames.find( f );
|
|
const FrameIt end = d->m_frames.end();
|
|
if ( it != end )
|