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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e3912b7b04ff1a33c3db8ee47a963b10bf8e57bb
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 5 21:14:06 2002 +0000

    Fixed window.top JS property (2939353).  This caused funny recursion problems at www.megapixel.net and other pages that try to pop frames.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 436a9bd..8842a2b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-06-05  Richard Williamson  <rjw at apple.com>
 
+    Fixed window.top JS property (2939353).  This caused funny recursion problems at
+    www.megapixel.net and other pages that try to pop frames.
+
+	* khtml/khtml_part.cpp:
+	(KHTMLPart::parentPart):
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::parentPart):
+	* kwq/KWQKHTMLPartImpl.h:
+
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
     Cleaned up call to frameNamed:.  Now use frame relative naming.
     Fixed various frame related bugs.
     
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 436a9bd..8842a2b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-06-05  Richard Williamson  <rjw at apple.com>
 
+    Fixed window.top JS property (2939353).  This caused funny recursion problems at
+    www.megapixel.net and other pages that try to pop frames.
+
+	* khtml/khtml_part.cpp:
+	(KHTMLPart::parentPart):
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::parentPart):
+	* kwq/KWQKHTMLPartImpl.h:
+
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
     Cleaned up call to frameNamed:.  Now use frame relative naming.
     Fixed various frame related bugs.
     
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 436a9bd..8842a2b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-06-05  Richard Williamson  <rjw at apple.com>
 
+    Fixed window.top JS property (2939353).  This caused funny recursion problems at
+    www.megapixel.net and other pages that try to pop frames.
+
+	* khtml/khtml_part.cpp:
+	(KHTMLPart::parentPart):
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::parentPart):
+	* kwq/KWQKHTMLPartImpl.h:
+
+2002-06-05  Richard Williamson  <rjw at apple.com>
+
     Cleaned up call to frameNamed:.  Now use frame relative naming.
     Fixed various frame related bugs.
     
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index bfb4ef5..31bb592 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3220,10 +3220,14 @@ bool KHTMLPart::frameExists( const QString &frameName )
 
 KHTMLPart *KHTMLPart::parentPart()
 {
+#ifdef APPLE_CHANGES
+  return impl->parentPart();
+#else
   if ( !parent() || !parent()->inherits( "KHTMLPart" ) )
     return 0L;
 
   return (KHTMLPart *)parent();
+#endif
 }
 
 #ifndef APPLE_CHANGES
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 0023175..6aa5e16 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -64,6 +64,8 @@ public:
 
     bool frameExists(const QString &frameName);
 
+    KHTMLPart *parentPart();
+
     void urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs);
     bool requestFrame(khtml::RenderPart *frame, const QString &url, const QString &frameName, const QStringList &params, bool isIFrame);
     bool requestObject(khtml::RenderPart *frame, const QString &url, const QString &serviceType, const QStringList &args);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index e116d79..894ad3f 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -685,3 +685,12 @@ IFWebDataSource *KWQKHTMLPartImpl::getDataSource()
 {
     return m_dataSource;
 }
+
+
+KHTMLPart *KWQKHTMLPartImpl::parentPart()
+{
+    IFWebDataSource *parent, *dataSource = getDataSource();
+    
+    parent = [dataSource parent];
+    return [parent _part];
+}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 0023175..6aa5e16 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -64,6 +64,8 @@ public:
 
     bool frameExists(const QString &frameName);
 
+    KHTMLPart *parentPart();
+
     void urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs);
     bool requestFrame(khtml::RenderPart *frame, const QString &url, const QString &frameName, const QStringList &params, bool isIFrame);
     bool requestObject(khtml::RenderPart *frame, const QString &url, const QString &serviceType, const QStringList &args);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index e116d79..894ad3f 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -685,3 +685,12 @@ IFWebDataSource *KWQKHTMLPartImpl::getDataSource()
 {
     return m_dataSource;
 }
+
+
+KHTMLPart *KWQKHTMLPartImpl::parentPart()
+{
+    IFWebDataSource *parent, *dataSource = getDataSource();
+    
+    parent = [dataSource parent];
+    return [parent _part];
+}

-- 
WebKit Debian packaging