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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 7e005cf3c5a25dba0c10b0bdfd2872ef07880ce2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 15 21:18:53 2004 +0000

    	Fixed 3529426.  Exclude pages that contain Java applets from
    	the page cache.  The means applets get the normal stop/destroy
    	messages that they expect when a user leaves a page.
    
            Reviewed by John.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::canCachePage):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5912 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 369b1ef..2509e8d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-01-15  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3529426.  Exclude pages that contain Java applets from 
+	the page cache.  The means applets get the normal stop/destroy
+	messages that they expect when a user leaves a page.
+
+        Reviewed by John.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::canCachePage):
+
 2004-01-15  Vicki Murley  <vicki at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index e762a88..99bbac8 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -38,6 +38,7 @@
 #import "WebCoreViewFactory.h"
 #import "csshelper.h"
 #import "html_documentimpl.h"
+#import "html_misc.h"
 #import "htmltokenizer.h"
 #import "khtmlpart_p.h"
 #import "khtmlview.h"
@@ -1125,7 +1126,9 @@ bool KWQKHTMLPart::canCachePage()
     if (d->m_frames.count() ||
         parentPart() ||
         m_url.protocol().startsWith("https") || 
-	(d->m_doc && (d->m_doc->hasWindowEventListener(EventImpl::UNLOAD_EVENT) ||
+	(d->m_doc && (
+//	(d->m_doc && (htmlDocument().applets().length() != 0 ||
+                      d->m_doc->hasWindowEventListener(EventImpl::UNLOAD_EVENT) ||
 		      d->m_doc->hasPasswordField()))) {
         return false;
     }

-- 
WebKit Debian packaging