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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 54b467de57e6a5f861760457dff7f2c62ec9820c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 26 22:14:25 2002 +0000

            Implement KHTMLPart::findFrame() to fix the following Radar bugs:
    
            Radar 2943177 - infinite JavaScript loop sfcu.org online bill paying
            Radar 2950580 - Unknown JavaScript properties on the Window object return self instead
    of Undefined
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::findFrame):
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPartImpl::findFrame):
            * kwq/KWQKHTMLPartImpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 355ecea..0948ffb 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-06-26  Maciej Stachowiak  <mjs at apple.com>
+
+        Implement KHTMLPart::findFrame() to fix the following Radar bugs:
+        
+        Radar 2943177 - infinite JavaScript loop sfcu.org online bill paying
+        Radar 2950580 - Unknown JavaScript properties on the Window object return self instead of Undefined
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::findFrame):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPartImpl::findFrame):
+        * kwq/KWQKHTMLPartImpl.h:
+
 2002-06-26  Darin Adler  <darin at apple.com>
 
 	- fixed 2969378 -- "A with hat" characters (Unicode 00C2) showing up at Zingermans.com
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 355ecea..0948ffb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-06-26  Maciej Stachowiak  <mjs at apple.com>
+
+        Implement KHTMLPart::findFrame() to fix the following Radar bugs:
+        
+        Radar 2943177 - infinite JavaScript loop sfcu.org online bill paying
+        Radar 2950580 - Unknown JavaScript properties on the Window object return self instead of Undefined
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::findFrame):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPartImpl::findFrame):
+        * kwq/KWQKHTMLPartImpl.h:
+
 2002-06-26  Darin Adler  <darin at apple.com>
 
 	- fixed 2969378 -- "A with hat" characters (Unicode 00C2) showing up at Zingermans.com
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 355ecea..0948ffb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-06-26  Maciej Stachowiak  <mjs at apple.com>
+
+        Implement KHTMLPart::findFrame() to fix the following Radar bugs:
+        
+        Radar 2943177 - infinite JavaScript loop sfcu.org online bill paying
+        Radar 2950580 - Unknown JavaScript properties on the Window object return self instead of Undefined
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::findFrame):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPartImpl::findFrame):
+        * kwq/KWQKHTMLPartImpl.h:
+
 2002-06-26  Darin Adler  <darin at apple.com>
 
 	- fixed 2969378 -- "A with hat" characters (Unicode 00C2) showing up at Zingermans.com
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index ce63adf..b87ac76 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3263,8 +3263,7 @@ khtml::ChildFrame *KHTMLPart::frame( const QObject *obj )
 KHTMLPart *KHTMLPart::findFrame( const QString &f )
 {
 #ifdef APPLE_CHANGES
-  // FIXME: Get rid of this method altogether rather than returning a bogus value?
-  return this;
+    return impl->findFrame(f);
 #else
 #if 0
   kdDebug() << "KHTMLPart::findFrame '" << f << "'" << endl;
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 3a7e883..489eb68 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -66,6 +66,7 @@ public:
     IFWebDataSource *getDataSource();
 
     bool frameExists(const QString &frameName);
+    KHTMLPart *findFrame(const QString &frameName);
     QPtrList<KParts::ReadOnlyPart> frames() const;
 
     KHTMLPart *parentPart();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index c141fb7..340940e 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -590,6 +590,11 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
     return [bridge childFrameNamed:frameName.getNSString()];
 }
 
+KHTMLPart *KWQKHTMLPartImpl::findFrame(const QString &frameName)
+{
+    return [[[bridge childFrameNamed:frameName.getNSString()] bridge] part];
+}
+
 QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
 {
     QPtrList<KParts::ReadOnlyPart> parts;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 3a7e883..489eb68 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -66,6 +66,7 @@ public:
     IFWebDataSource *getDataSource();
 
     bool frameExists(const QString &frameName);
+    KHTMLPart *findFrame(const QString &frameName);
     QPtrList<KParts::ReadOnlyPart> frames() const;
 
     KHTMLPart *parentPart();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index c141fb7..340940e 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -590,6 +590,11 @@ bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
     return [bridge childFrameNamed:frameName.getNSString()];
 }
 
+KHTMLPart *KWQKHTMLPartImpl::findFrame(const QString &frameName)
+{
+    return [[[bridge childFrameNamed:frameName.getNSString()] bridge] part];
+}
+
 QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
 {
     QPtrList<KParts::ReadOnlyPart> parts;

-- 
WebKit Debian packaging