[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 c07cd913d02d5c81cbbdb112a6a2ce5670435559
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 9 21:16:37 2003 +0000

    	Fixed: <rdar://problem/3284848>: REGRESSION: repro crash in Flash handling null event, going back to Japanese Disney page
    
    	When restarting plug-ins from the BF cache, we were not calling NPP_SetWindow.
    
            Reviewed by darin.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView stop]): set the window type to 0 to force the calling of NPP_SetWindow
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4504 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 206b0ab..70638d3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-06-09  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3284848>: REGRESSION: repro crash in Flash handling null event, going back to Japanese Disney page
+
+	When restarting plug-ins from the BF cache, we were not calling NPP_SetWindow.
+
+        Reviewed by darin.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView stop]): set the window type to 0 to force the calling of NPP_SetWindow 
+
 === Safari-83 ===
 
 2003-06-07  Darin Adler  <darin at apple.com>
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index dc9b875..762d052 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -810,7 +810,7 @@ typedef struct {
     [self resetTrackingRect];
     
     [self didStart];
-
+    
     return YES;
 }
 
@@ -836,6 +836,9 @@ typedef struct {
     // Stop notifications and callbacks.
     [self removeWindowObservers];
     [NSObject cancelPreviousPerformRequestsWithTarget:self];
+
+    // Setting the window type to 0 ensures that NPP_SetWindow will be called if the plug-in is restarted.
+    lastSetWindow.type = 0;
     
     NPError npErr;
     npErr = NPP_Destroy(instance, NULL);

-- 
WebKit Debian packaging