[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 cd8e3a0d16694528ef5beefca0c63bccad8fbf5a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 26 06:20:29 2002 +0000

            Changed ordering of cachability check.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _setState:]):
    
            Added check for non-nil doc.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::setView):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 901f7be..358a7f4 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-25  Richard Williamson   <rjw at apple.com>
+
+        Added check for non-nil doc.
+        
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::setView):
+
 2002-11-25  David Hyatt  <hyatt at apple.com>
 
 	Fix for the DHTML on hrweb.  With these changes it works
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 901f7be..358a7f4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-11-25  Richard Williamson   <rjw at apple.com>
+
+        Added check for non-nil doc.
+        
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::setView):
+
 2002-11-25  David Hyatt  <hyatt at apple.com>
 
 	Fix for the DHTML on hrweb.  With these changes it works
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 901f7be..358a7f4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-11-25  Richard Williamson   <rjw at apple.com>
+
+        Added check for non-nil doc.
+        
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::setView):
+
 2002-11-25  David Hyatt  <hyatt at apple.com>
 
 	Fix for the DHTML on hrweb.  With these changes it works
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 64dc1b7..1622b89 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -223,8 +223,9 @@ ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url,
     
 void KWQKHTMLPart::setView(KHTMLView *view, bool weOwnIt)
 {
-    if (_ownsView && !d->m_doc->inPageCache()) {
-        delete d->m_view;
+    if (_ownsView) {
+        if (!(d->m_doc && d->m_doc->inPageCache()))
+            delete d->m_view;
     }
     d->m_view = view;
     part->setWidget(view);
@@ -435,7 +436,6 @@ bool KWQKHTMLPart::canCachePage()
         d->m_objects.count() ||
         d->m_doc->getWindowEventListener (DOM::EventImpl::UNLOAD_EVENT) ||
         (d->m_jscript && KJS::Window::retrieveWindow(part)->hasTimeouts()))){
-        printf ("Not saving page state for %s\n", part->m_url.url().latin1());
         return false;
     }
     return true;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9098189..eef21ec 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
+        Changed ordering of cachability check.
+        
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]):
+
+2002-11-25  Richard Williamson   <rjw at apple.com>
+
         Changes fro back/forward cache.
         
         * History.subproj/WebHistoryItem.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9098189..eef21ec 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
+        Changed ordering of cachability check.
+        
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]):
+
+2002-11-25  Richard Williamson   <rjw at apple.com>
+
         Changes fro back/forward cache.
         
         * History.subproj/WebHistoryItem.h:
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index f79e16c..e4a103f 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -571,7 +571,7 @@ static const char * const stateNames[] = {
         [[[self webView] frameScrollView] setDrawsBackground:NO];
 
         // Cache the page, if possible.
-        if ([_private->bridge canCachePage] && [self _canCachePage] && [_private currentItem]){
+        if ([self _canCachePage] && [_private->bridge canCachePage] && [_private currentItem]){
             if (![[_private currentItem] pageCache]){
                 NSLog (@"saving page cache for %@, %@", [self name], [[self dataSource] URL]);
                 [[_private currentItem] setPageCacheEnabled: YES];

-- 
WebKit Debian packaging