[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 7f74f970be8daf2892f5343cf5d0208cecbda3b7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 25 00:09:14 2003 +0000

            Reviewed by Dave.
    
            - fixed a recent regression, and ...
            - fixed 3386544 -- ARCH: <object>s don't support transclusion like <iframe>s do
    
            * khtml/khtml_part.cpp: (KHTMLPart::childFrame): Added back a cast I should
            not have removed to fix the function.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 09f7e8b..c7eeecc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-09-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed a recent regression, and ...
+        - fixed 3386544 -- ARCH: <object>s don't support transclusion like <iframe>s do
+
+        * khtml/khtml_part.cpp: (KHTMLPart::childFrame): Added back a cast I should
+        not have removed to fix the function.
+
 2003-09-24  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3430612, crash on about:blank in updateHoverActiveState.  Just missing
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 09f7e8b..c7eeecc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-09-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed a recent regression, and ...
+        - fixed 3386544 -- ARCH: <object>s don't support transclusion like <iframe>s do
+
+        * khtml/khtml_part.cpp: (KHTMLPart::childFrame): Added back a cast I should
+        not have removed to fix the function.
+
 2003-09-24  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3430612, crash on about:blank in updateHoverActiveState.  Just missing
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index b4f2fa1..115d87f 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3597,18 +3597,18 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
 khtml::ChildFrame *KHTMLPart::childFrame( const QObject *obj )
 {
     assert( obj->inherits( "KParts::ReadOnlyPart" ) );
-    const KParts::ReadOnlyPart *part = static_cast<const KParts::ReadOnlyPart *>( obj );
+    const ReadOnlyPart *part = static_cast<const ReadOnlyPart *>( obj );
 
     FrameIt it = d->m_frames.begin();
     FrameIt end = d->m_frames.end();
     for (; it != end; ++it )
-      if ( (*it).m_part == part )
+      if ( static_cast<ReadOnlyPart *>((*it).m_part) == part )
         return &(*it);
 
     it = d->m_objects.begin();
     end = d->m_objects.end();
     for (; it != end; ++it )
-      if ( (*it).m_part == part )
+      if ( static_cast<ReadOnlyPart *>((*it).m_part) == part )
         return &(*it);
 
     return 0L;

-- 
WebKit Debian packaging