[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 78d81f9825da93f26c48d7976821a624b6b36d43
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 20 17:13:18 2002 +0000

    	- fixed 3055339 -- repro crash in RenderPartObject::updateWidget()
    
            * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
    	Only create a new part if we have no old part.
    
            * kwq/KWQtextstream.mm: Remove some of the "not implemented" logging.
    	Once we have logged that the stream is not created correctly, there's no need
    	to continue logging each time something is written out to the non-stream.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2105 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 05ede80..c295714 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-09-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3055339 -- repro crash in RenderPartObject::updateWidget()
+
+        * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+	Only create a new part if we have no old part.
+
+        * kwq/KWQtextstream.mm: Remove some of the "not implemented" logging.
+	Once we have logged that the stream is not created correctly, there's no need
+	to continue logging each time something is written out to the non-stream.
+
 2002-09-19  Richard Williamson   <rjw at apple.com>
 
         Implemented double and triple click selection.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 05ede80..c295714 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-09-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3055339 -- repro crash in RenderPartObject::updateWidget()
+
+        * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+	Only create a new part if we have no old part.
+
+        * kwq/KWQtextstream.mm: Remove some of the "not implemented" logging.
+	Once we have logged that the stream is not created correctly, there's no need
+	to continue logging each time something is written out to the non-stream.
+
 2002-09-19  Richard Williamson   <rjw at apple.com>
 
         Implemented double and triple click selection.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 05ede80..c295714 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-09-20  Darin Adler  <darin at apple.com>
+
+	- fixed 3055339 -- repro crash in RenderPartObject::updateWidget()
+
+        * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+	Only create a new part if we have no old part.
+
+        * kwq/KWQtextstream.mm: Remove some of the "not implemented" logging.
+	Once we have logged that the stream is not created correctly, there's no need
+	to continue logging each time something is written out to the non-stream.
+
 2002-09-19  Richard Williamson   <rjw at apple.com>
 
         Implemented double and triple click selection.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 350e0a9..bc5d9a6 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2745,11 +2745,13 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
           emit d->m_extension->openURLNotify();
   }
 
-  if ( !child->m_services.contains( mimetype ) )
+#if APPLE_CHANGES
+  if ( !child->m_part )
   {
-#ifdef APPLE_CHANGES
     KParts::ReadOnlyPart *part = impl->createPart(*child, url, mimetype);
 #else
+  if ( !child->m_services.contains( mimetype ) )
+  {
     KParts::ReadOnlyPart *part = createPart( d->m_view->viewport(), child->m_name.ascii(), this, child->m_name.ascii(), mimetype, child->m_serviceName, child->m_services, child->m_params );
 #endif
 
@@ -2802,7 +2804,9 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
                part, SLOT( slotParentCompleted() ) );
     }
 
-#ifndef APPLE_CHANGES
+#if APPLE_CHANGES
+  }
+#else
     child->m_extension = KParts::BrowserExtension::childObject( part );
 
     if ( child->m_extension )
@@ -2832,8 +2836,8 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
 
       child->m_extension->setBrowserInterface( d->m_extension->browserInterface() );
     }
-#endif
   }
+#endif
 
   checkEmitLoadEvent();
   // Some JS code in the load event may have destroyed the part
diff --git a/WebCore/kwq/KWQTextStream.mm b/WebCore/kwq/KWQTextStream.mm
index ef448cf..31c6ab5 100644
--- a/WebCore/kwq/KWQTextStream.mm
+++ b/WebCore/kwq/KWQTextStream.mm
@@ -27,14 +27,10 @@
 
 #import <qtextstream.h>
 
-// class QTextStream ===========================================================
-
 QTextStream::QTextStream()
 {
-    ERROR("not yet implemented");
 }
 
-
 QTextStream::QTextStream(QByteArray, int)
 {
     ERROR("not yet implemented");
@@ -45,64 +41,46 @@ QTextStream::QTextStream(QString *, int)
     ERROR("not yet implemented");
 }
 
-
 QTextStream::~QTextStream()
 {
-    ERROR("not yet implemented");
 }
 
-
 QTextStream &QTextStream::operator<<(char)
 {
-    ERROR("not yet implemented");
     return *this;
 }
 
-
 QTextStream &QTextStream::operator<<(const char *)
 {
-    ERROR("not yet implemented");
     return *this;
 }
 
-
 QTextStream &QTextStream::operator<<(const QCString &)
 {
-    ERROR("not yet implemented");
     return *this;
 }
 
-
 QTextStream &QTextStream::operator<<(const QString &)
 {
-    ERROR("not yet implemented");
     return *this;
 }
 
-
-// class QTextIStream ==========================================================
-
 QTextIStream::QTextIStream(QString *)
 {
     ERROR("not yet implemented");
 }
 
-
 QString QTextIStream::readLine()
 {
     ERROR("not yet implemented");
     return QString();
 }
 
-
-// class QTextOStream ==========================================================
-
 QTextOStream::QTextOStream(QString *)
 {
     ERROR("not yet implemented");
 }
 
-
 QTextOStream::QTextOStream(QByteArray)
 {
     ERROR("not yet implemented");
@@ -114,21 +92,17 @@ QString QTextOStream::readLine()
     return QString();
 }
 
-
 QTextStream &QTextStream::operator<<(QTextStream &(*const &)(QTextStream &)) 
 {
-    ERROR("not yet implemented");
     return *this;
 }
 
 QTextStream &QTextStream::operator<<(void const *)
 {
-    ERROR("not yet implemented");
     return *this;
 }
 
 QTextStream &endl(QTextStream& stream)
 {
-    ERROR("not yet implemented");
     return stream;
 }

-- 
WebKit Debian packaging