[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 2684cf6a5c4e824815de6e415aff591e248be9b5
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 17 22:46:03 2003 +0000

            Fixed 3126141. Allow pages with plugins to be cached.  This is safe
            because plugins are cleanly started/stopped when their containing views are
            added/removed from the view hierarchy.
    
            Reviewed by trey.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::canCachePage):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3352 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 65a01c2..5d2157d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-17  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3126141. Allow pages with plugins to be cached.  This is safe
+        because plugins are cleanly started/stopped when their containing views are
+        added/removed from the view hierarchy.
+        
+        Reviewed by trey.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::canCachePage):
+
+=======
 2003-01-17  David Hyatt  <hyatt at apple.com>
 
 	The new table code from Lars.  Also includes bug fixes for
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 65a01c2..5d2157d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-01-17  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3126141. Allow pages with plugins to be cached.  This is safe
+        because plugins are cleanly started/stopped when their containing views are
+        added/removed from the view hierarchy.
+        
+        Reviewed by trey.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::canCachePage):
+
+=======
 2003-01-17  David Hyatt  <hyatt at apple.com>
 
 	The new table code from Lars.  Also includes bug fixes for
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 690e209..5b6fa04 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -473,15 +473,12 @@ bool KWQKHTMLPart::canCachePage()
 {
     // Only save page state if:
     // 1.  We're not a frame or frameset.
-    // 2.  The page has no javascript timers.
-    // 3.  The page has no unload handler.
-    // 4.  The page has no password fields.
-    // 5.  The page has no plugins.
-    // 6.  The page has no JavaScript window timeouts.
+    // 2.  The page has no unload handler.
+    // 3.  The page has no password fields.
+    // 4.  The page has no javascript timers.
     if (d->m_doc &&
         (d->m_frames.count() ||
         parentPart() ||
-        d->m_objects.count() ||
         d->m_doc->getWindowEventListener (EventImpl::UNLOAD_EVENT) ||
         d->m_doc->hasPasswordField())) {
         return false;

-- 
WebKit Debian packaging