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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 2b1a69dc59b93b8fec88b8ed0c0264b11c2b9dbc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 10 16:01:22 2002 +0000

    	Add back the APPLE_CHANGES for a few frame cases. We need to do some real testing
    	before we remove our alternate versions of these (but I still hope we do remove them).
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::findFrame): Back to the old way.
            (KHTMLPart::frameExists): Ditto.
            (KHTMLPart::frames): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8436839..d282bef 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-09-10  Darin Adler  <darin at apple.com>
 
+	Add back the APPLE_CHANGES for a few frame cases. We need to do some real testing
+	before we remove our alternate versions of these (but I still hope we do remove them).
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::findFrame): Back to the old way.
+        (KHTMLPart::frameExists): Ditto.
+        (KHTMLPart::frames): Ditto.
+
+2002-09-10  Darin Adler  <darin at apple.com>
+
 	- fixed 2942809 -- remove all direct access to "WebKit" defaults from WebCore
 
         * kwq/WebCoreSettings.h: Add willLoadImagesAutomatically and userStyleSheetLocation.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8436839..d282bef 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-09-10  Darin Adler  <darin at apple.com>
 
+	Add back the APPLE_CHANGES for a few frame cases. We need to do some real testing
+	before we remove our alternate versions of these (but I still hope we do remove them).
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::findFrame): Back to the old way.
+        (KHTMLPart::frameExists): Ditto.
+        (KHTMLPart::frames): Ditto.
+
+2002-09-10  Darin Adler  <darin at apple.com>
+
 	- fixed 2942809 -- remove all direct access to "WebKit" defaults from WebCore
 
         * kwq/WebCoreSettings.h: Add willLoadImagesAutomatically and userStyleSheetLocation.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8436839..d282bef 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-09-10  Darin Adler  <darin at apple.com>
 
+	Add back the APPLE_CHANGES for a few frame cases. We need to do some real testing
+	before we remove our alternate versions of these (but I still hope we do remove them).
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::findFrame): Back to the old way.
+        (KHTMLPart::frameExists): Ditto.
+        (KHTMLPart::frames): Ditto.
+
+2002-09-10  Darin Adler  <darin at apple.com>
+
 	- fixed 2942809 -- remove all direct access to "WebKit" defaults from WebCore
 
         * kwq/WebCoreSettings.h: Add willLoadImagesAutomatically and userStyleSheetLocation.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index af6438a..6589d6b 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3269,6 +3269,9 @@ khtml::ChildFrame *KHTMLPart::frame( const QObject *obj )
 
 KHTMLPart *KHTMLPart::findFrame( const QString &f )
 {
+#ifdef APPLE_CHANGES
+    return impl->findFrame(f);
+#else
 #if 0
   kdDebug() << "KHTMLPart::findFrame '" << f << "'" << endl;
   FrameIt it2 = d->m_frames.begin();
@@ -3301,6 +3304,7 @@ KHTMLPart *KHTMLPart::findFrame( const QString &f )
       return 0L;
     }
   }
+#endif // APPLE_CHANGES
 }
 
 #ifndef APPLE_CHANGES
@@ -3324,6 +3328,9 @@ KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
 
 bool KHTMLPart::frameExists( const QString &frameName )
 {
+#ifdef APPLE_CHANGES
+  return impl->frameExists(frameName);
+#else
   ConstFrameIt it = d->m_frames.find( frameName );
   if ( it == d->m_frames.end() )
     return false;
@@ -3332,6 +3339,7 @@ bool KHTMLPart::frameExists( const QString &frameName )
   // set. Otherwise we might find our preloaded-selve.
   // This happens when we restore the frameset.
   return (!(*it).m_frame.isNull());
+#endif
 }
 
 KHTMLPart *KHTMLPart::parentPart()
@@ -3823,6 +3831,9 @@ QStringList KHTMLPart::frameNames() const
 
 QPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const
 {
+#ifdef APPLE_CHANGES
+  return impl->frames();
+#else
   QPtrList<KParts::ReadOnlyPart> res;
 
   ConstFrameIt it = d->m_frames.begin();
@@ -3832,6 +3843,7 @@ QPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const
       res.append( (*it).m_part );
 
   return res;
+#endif
 }
 
 #ifndef APPLE_CHANGES

-- 
WebKit Debian packaging