[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 a11fd14b3dd6de7e1df08035226d08476d6080ba
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 23 06:34:09 2002 +0000

            Reviewed by NOBODY (OOPS!).
    
    	- fixed 3134383 -- crash in KWQKHTMLPart::canCachePage at www.apple.com
    
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::canCachePage):
    	Check for nil in the result of Window::retrieveWindow.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3172 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3832b47..8a6a32c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-12-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+	- fixed 3134383 -- crash in KWQKHTMLPart::canCachePage at www.apple.com
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::canCachePage):
+	Check for nil in the result of Window::retrieveWindow.
+
 === Alexander-44 ===
 
 2002-12-20  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3832b47..8a6a32c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-12-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+	- fixed 3134383 -- crash in KWQKHTMLPart::canCachePage at www.apple.com
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::canCachePage):
+	Check for nil in the result of Window::retrieveWindow.
+
 === Alexander-44 ===
 
 2002-12-20  Darin Adler  <darin at apple.com>
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 0f35147..0a90ccf 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -444,14 +444,20 @@ bool KWQKHTMLPart::canCachePage()
     // 2.  The page has no javascript timers.
     // 3.  The page has no unload handler.
     // 4.  The page has no plugins.
+    // 5.  The page has no JavaScript window timeouts.
     if (d->m_doc &&
         (d->m_frames.count() ||
         parentPart() ||
         d->m_objects.count() ||
-        d->m_doc->getWindowEventListener (EventImpl::UNLOAD_EVENT) ||
-        (d->m_jscript && Window::retrieveWindow(this)->hasTimeouts()))){
+        d->m_doc->getWindowEventListener (EventImpl::UNLOAD_EVENT))) {
         return false;
     }
+    if (d->m_doc && d->m_jscript) {
+        Window *w = Window::retrieveWindow(this);
+        if (w && w->hasTimeouts()) {
+            return false;
+        }
+    }
     return true;
 }
 

-- 
WebKit Debian packaging