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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 3654a462a9f44c879723091d143b1154ba121705
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 27 20:48:51 2003 +0000

    	Fixed: <rdar://problem/3462523>: Safari Sometimes Destroys Applets When Going "Back"
    
            Reviewed by darin.
    
            * History.subproj/WebHistoryItem.m:
            (+[WebHistoryItem _destroyAllPluginsInPendingPageCaches]): Don't destroy plug-ins that are currently being viewed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5277 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 95d45d2..462a077 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2003-10-27  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3462523>: Safari Sometimes Destroys Applets When Going "Back"
+
+        Reviewed by darin.
+
+        * History.subproj/WebHistoryItem.m:
+        (+[WebHistoryItem _destroyAllPluginsInPendingPageCaches]): Don't destroy plug-ins that are currently being viewed.
+
+2003-10-27  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3463144>: assertion failure when viewing jpeg with SoundPix installed
 
         Reviewed by john.
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index a721a97..0269caf 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -6,6 +6,7 @@
 #import <WebKit/WebHistoryItemPrivate.h>
 
 #import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameView.h>
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebIconDatabase.h>
 #import <WebKit/WebIconLoader.h>
@@ -623,7 +624,10 @@ static NSTimer *_pageCacheReleaseTimer = nil;
     while ((pageCache = [pageCaches nextObject]) != nil) {
         WebHTMLView *HTMLView = [pageCache objectForKey:WebPageCacheDocumentViewKey];
         if ([HTMLView isKindOfClass:[WebHTMLView class]]) {
-            [[HTMLView _pluginController] destroyAllPlugins];
+            // Don't destroy plug-ins that are currently being viewed.
+            if ([[[HTMLView _frame] frameView] documentView] != HTMLView) {
+                [[HTMLView _pluginController] destroyAllPlugins];
+            }
         }
     }
 }

-- 
WebKit Debian packaging