[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 a56261554698a7387d786aada4093fcd78ea3475
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 20 20:48:08 2003 +0000

            Reviewed by Richard.
    
    	- fixed 3292036 - albertsons.com world leak of 2 WebDataSource and 2 WebHTMLRepresentation objects
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::canCachePage): Test for parentPart() even if there
    	is no document.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4849 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 35cc5f5..8013434 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-08-20  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3292036 - albertsons.com world leak of 2 WebDataSource and 2 WebHTMLRepresentation objects
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::canCachePage): Test for parentPart() even if there
+	is no document.
+
 2003-08-20  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3242508.  Japanese (and other non latin1 scripts) line breaking incorrect when mixed with latin1.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 35cc5f5..8013434 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-08-20  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3292036 - albertsons.com world leak of 2 WebDataSource and 2 WebHTMLRepresentation objects
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::canCachePage): Test for parentPart() even if there
+	is no document.
+
 2003-08-20  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3242508.  Japanese (and other non latin1 scripts) line breaking incorrect when mixed with latin1.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index d65131d..72df723 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -978,11 +978,10 @@ bool KWQKHTMLPart::canCachePage()
     // 1.  We're not a frame or frameset.
     // 2.  The page has no unload handler.
     // 3.  The page has no password fields.
-    if (d->m_doc &&
-        (d->m_frames.count() ||
+    if (d->m_frames.count() ||
         parentPart() ||
-        d->m_doc->hasWindowEventListener (EventImpl::UNLOAD_EVENT) ||
-        d->m_doc->hasPasswordField())) {
+	(d->m_doc && (d->m_doc->hasWindowEventListener(EventImpl::UNLOAD_EVENT) ||
+		      d->m_doc->hasPasswordField()))) {
         return false;
     }
     return true;

-- 
WebKit Debian packaging