[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 5cba585b02fc258426b06f47f4d5e2158db7f516
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 29 07:05:47 2002 +0000

            * khtml/khtml_part.cpp: (KHTMLPart::checkCompleted):
    	Update so it handles nil for the view.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4809489..f4a9b57 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-10-28  Darin Adler  <darin at apple.com>
 
+        * khtml/khtml_part.cpp: (KHTMLPart::checkCompleted):
+	Update so it handles nil for the view.
+
+2002-10-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3070484 -- icon rollovers are very slow on Mac OS X website
 
 	The problem was simply that the part didn't know it was complete.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4809489..f4a9b57 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-10-28  Darin Adler  <darin at apple.com>
 
+        * khtml/khtml_part.cpp: (KHTMLPart::checkCompleted):
+	Update so it handles nil for the view.
+
+2002-10-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3070484 -- icon rollovers are very slow on Mac OS X website
 
 	The problem was simply that the part didn't know it was complete.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4809489..f4a9b57 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-10-28  Darin Adler  <darin at apple.com>
 
+        * khtml/khtml_part.cpp: (KHTMLPart::checkCompleted):
+	Update so it handles nil for the view.
+
+2002-10-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3070484 -- icon rollovers are very slow on Mac OS X website
 
 	The problem was simply that the part didn't know it was complete.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 5d78b16..46aa051 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1619,6 +1619,10 @@ void KHTMLPart::checkCompleted()
 
   checkEmitLoadEvent(); // if we didn't do it before
 
+#if APPLE_CHANGES
+  if (d->m_view) {
+#endif
+
   // check that the view has not been moved by the user
   if ( m_url.encodedHtmlRef().isEmpty() && d->m_view->contentsY() == 0 )
       d->m_view->setContentsPos( d->m_extension->urlArgs().xOffset,
@@ -1626,6 +1630,10 @@ void KHTMLPart::checkCompleted()
 
   d->m_view->complete();
 
+#if APPLE_CHANGES
+  } // if (d->m_view)
+#endif
+
   if ( !d->m_redirectURL.isEmpty() )
   {
     // Do not start redirection for frames here! That action is

-- 
WebKit Debian packaging