[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 62b5b5a2cae690109846a882791c5233abc352d7
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 23 00:29:06 2002 +0000

    Now sending null events after first drawRect when the port is valid. This was causing Flash to crash
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@663 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 68c7464..7b3fa5b 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -129,8 +129,6 @@ extern "C" {
     activeURLHandles = [NSMutableArray arrayWithCapacity:1];
     [activeURLHandles retain];
     [[self window] _windowRef];
-    eventSender = [[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent];
-    [eventSender sendNullEvents];
     return self;
 }
 
@@ -144,6 +142,8 @@ extern "C" {
         [notificationCenter addObserver:self selector:@selector(viewHasMoved:) name:@"NSWindowDidResizeNotification" object:[self window]];
         [self sendActivateEvent];
         [self newStream:URL mimeType:mime notifyData:NULL];
+        eventSender = [[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent];
+        [eventSender sendNullEvents];
         transferred = TRUE;
     }
     [self sendUpdateEvent];
@@ -254,8 +254,10 @@ extern "C" {
         streamData->data = [NSMutableData dataWithCapacity:0];
         [streamData->data retain];
         urlHandle = (IFURLHandle *)WCURLHandleCreate([NSURL URLWithString:streamURL], self, streamData);
-        [activeURLHandles addObject:urlHandle];
-        [urlHandle loadInBackground];
+        if(urlHandle!=nil){
+            [activeURLHandles addObject:urlHandle];
+            [urlHandle loadInBackground];
+        }
     }else if(transferMode == NP_SEEK){
         KWQDebug("Stream type: NP_SEEK not yet supported\n");
     }
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 68c7464..7b3fa5b 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -129,8 +129,6 @@ extern "C" {
     activeURLHandles = [NSMutableArray arrayWithCapacity:1];
     [activeURLHandles retain];
     [[self window] _windowRef];
-    eventSender = [[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent];
-    [eventSender sendNullEvents];
     return self;
 }
 
@@ -144,6 +142,8 @@ extern "C" {
         [notificationCenter addObserver:self selector:@selector(viewHasMoved:) name:@"NSWindowDidResizeNotification" object:[self window]];
         [self sendActivateEvent];
         [self newStream:URL mimeType:mime notifyData:NULL];
+        eventSender = [[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent];
+        [eventSender sendNullEvents];
         transferred = TRUE;
     }
     [self sendUpdateEvent];
@@ -254,8 +254,10 @@ extern "C" {
         streamData->data = [NSMutableData dataWithCapacity:0];
         [streamData->data retain];
         urlHandle = (IFURLHandle *)WCURLHandleCreate([NSURL URLWithString:streamURL], self, streamData);
-        [activeURLHandles addObject:urlHandle];
-        [urlHandle loadInBackground];
+        if(urlHandle!=nil){
+            [activeURLHandles addObject:urlHandle];
+            [urlHandle loadInBackground];
+        }
     }else if(transferMode == NP_SEEK){
         KWQDebug("Stream type: NP_SEEK not yet supported\n");
     }

-- 
WebKit Debian packaging