[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 ac2caf0a8b3709d3d2f232d34a7c68670d092959
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 5 23:49:28 2002 +0000

        Fixed 2938552.  This required an implementation of KHTMLPart::frames which
        is used by the JS window.frames property.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8842a2b..7737bcf 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 2938552.  This required an implementation of KHTMLPart::frames which
+    is used by the JS window.frames property.
+    
+	* khtml/khtml_part.cpp:
+	(KHTMLPart::frames):
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::frames):
+	* kwq/KWQKHTMLPartImpl.h:
+
+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.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8842a2b..7737bcf 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 2938552.  This required an implementation of KHTMLPart::frames which
+    is used by the JS window.frames property.
+    
+	* khtml/khtml_part.cpp:
+	(KHTMLPart::frames):
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::frames):
+	* kwq/KWQKHTMLPartImpl.h:
+
+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.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8842a2b..7737bcf 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 2938552.  This required an implementation of KHTMLPart::frames which
+    is used by the JS window.frames property.
+    
+	* khtml/khtml_part.cpp:
+	(KHTMLPart::frames):
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::frames):
+	* kwq/KWQKHTMLPartImpl.h:
+
+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.
 
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 31bb592..fd4efe9 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3706,8 +3706,7 @@ QStringList KHTMLPart::frameNames() const
 QPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const
 {
 #ifdef APPLE_CHANGES
-  // FIXME: Get rid of this method altogether rather than returning a bogus value?
-  return QPtrList<KParts::ReadOnlyPart>();
+  return impl->frames();
 #else
   QPtrList<KParts::ReadOnlyPart> res;
 
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 6aa5e16..647d139 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -63,6 +63,7 @@ public:
     IFWebDataSource *getDataSource();
 
     bool frameExists(const QString &frameName);
+    QPtrList<KParts::ReadOnlyPart> frames() const;
 
     KHTMLPart *parentPart();
 
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 894ad3f..bf5d634 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -649,6 +649,21 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
     return [getDataSource() frameExists: (NSString *)frameName.getCFMutableString()];
 }
 
+QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
+{
+    QPtrList<KParts::ReadOnlyPart> res;
+    IFWebDataSource *thisDataSource = ((KWQKHTMLPartImpl *)this)->getDataSource();
+    NSArray *children = [thisDataSource children];
+    IFWebFrame *aFrame;
+    unsigned int i;
+    
+    for (i = 0; i < [children count]; i++){
+        aFrame = [children objectAtIndex: i];
+        res.append( [[aFrame dataSource] _part] );
+    }
+    return res;
+}
+
 QString KWQKHTMLPartImpl::documentSource() const
 {
     return m_documentSource;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 6aa5e16..647d139 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -63,6 +63,7 @@ public:
     IFWebDataSource *getDataSource();
 
     bool frameExists(const QString &frameName);
+    QPtrList<KParts::ReadOnlyPart> frames() const;
 
     KHTMLPart *parentPart();
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 894ad3f..bf5d634 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -649,6 +649,21 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
     return [getDataSource() frameExists: (NSString *)frameName.getCFMutableString()];
 }
 
+QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
+{
+    QPtrList<KParts::ReadOnlyPart> res;
+    IFWebDataSource *thisDataSource = ((KWQKHTMLPartImpl *)this)->getDataSource();
+    NSArray *children = [thisDataSource children];
+    IFWebFrame *aFrame;
+    unsigned int i;
+    
+    for (i = 0; i < [children count]; i++){
+        aFrame = [children objectAtIndex: i];
+        res.append( [[aFrame dataSource] _part] );
+    }
+    return res;
+}
+
 QString KWQKHTMLPartImpl::documentSource() const
 {
     return m_documentSource;

-- 
WebKit Debian packaging