[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 c5135a70fee8680175148763578725c76cbb4ef4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 29 18:13:30 2002 +0000

            Reviewed by Don.
    
    	- follow-on to my fix for 3125877 that fixes a crash I observed when a plug-in fails to NPP_New
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView sendEvent:]): Return quietly if this is called when
    	the plug-in is not started rather than asserting (and doing bad things on Deployment).
            (-[WebBaseNetscapePluginView setWindow]): Ditto.
            (-[WebBaseNetscapePluginView viewHasMoved:]): Just call setWindow since it now checks isStarted.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 46423f6..3105d5e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Don.
 
+	- follow-on to my fix for 3125877 that fixes a crash I observed when a plug-in fails to NPP_New
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView sendEvent:]): Return quietly if this is called when
+	the plug-in is not started rather than asserting (and doing bad things on Deployment).
+        (-[WebBaseNetscapePluginView setWindow]): Ditto.
+        (-[WebBaseNetscapePluginView viewHasMoved:]): Just call setWindow since it now checks isStarted.
+
+2002-12-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
 	- fixed 3120630 -- spacebar scrolls the page as well as pausing the QuickTime movie
 
 	Imitate Mozilla and OmniWeb by not propagating keyboard events after passing them to
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index d6f492e..d282ec4 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -251,7 +251,9 @@ typedef struct {
 
 - (BOOL)sendEvent:(EventRecord *)event
 {
-    ASSERT(isStarted);
+    if (!isStarted || !NPP_HandleEvent) {
+        return NO;
+    }
     
     BOOL defers = [[self controller] _defersCallbacks];
     if (!defers) {
@@ -271,10 +273,7 @@ typedef struct {
     }
 #endif
 
-    BOOL acceptedEvent = NO;
-    if (NPP_HandleEvent) {
-        acceptedEvent = NPP_HandleEvent(instance, event);
-    }
+    BOOL acceptedEvent = NPP_HandleEvent(instance, event);
 
     [self restorePortState:portState];
 
@@ -557,7 +556,9 @@ typedef struct {
 
 - (void)setWindow
 {
-    ASSERT(isStarted);
+    if (!isStarted) {
+        return;
+    }
     
     PortState portState = [self saveAndSetPortState];
 
@@ -857,9 +858,7 @@ typedef struct {
 
 -(void)viewHasMoved:(NSNotification *)notification
 {
-    if (isStarted) {
-        [self setWindow];
-    }
+    [self setWindow];
     [self resetTrackingRect];
 }
 

-- 
WebKit Debian packaging