[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 f822ce856d2f4a6da8a318b948785c99410b8054
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 28 19:35:05 2002 +0000

    	Support for latest Flash plug-in. It requests a javascript URL for every plug-in instance. Until javascript URLs work, we return an error to the plug-in.
    
    	Fixed: 3035582 - flash animations don't work after upgrading flash
    	Fixed: 3021936 - links in flash at foggypetronasracing.com doesn't work
    
            * Plugins.subproj/WebPluginStream.h:
            * Plugins.subproj/WebPluginStream.m:
            (-[WebNetscapePluginStream initWithURL:pluginPointer:notifyData:]): Make the request here and return nil if we can't create a handle with it.
            (-[WebNetscapePluginStream dealloc]): release the request
            (-[WebNetscapePluginStream startLoad]): use the request when creating the handle
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2198 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f14c466..15335b1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-09-28  Chris Blumenberg  <cblu at apple.com>
+
+	Support for latest Flash plug-in. It requests a javascript URL for every plug-in instance. Until javascript URLs work, we return an error to the plug-in. 
+
+	Fixed: 3035582 - flash animations don't work after upgrading flash
+	Fixed: 3021936 - links in flash at foggypetronasracing.com doesn't work
+
+        * Plugins.subproj/WebPluginStream.h:
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream initWithURL:pluginPointer:notifyData:]): Make the request here and return nil if we can't create a handle with it.
+        (-[WebNetscapePluginStream dealloc]): release the request
+        (-[WebNetscapePluginStream startLoad]): use the request when creating the handle
+
 2002-09-28  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setNeedsLayout]): Added.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f14c466..15335b1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-09-28  Chris Blumenberg  <cblu at apple.com>
+
+	Support for latest Flash plug-in. It requests a javascript URL for every plug-in instance. Until javascript URLs work, we return an error to the plug-in. 
+
+	Fixed: 3035582 - flash animations don't work after upgrading flash
+	Fixed: 3021936 - links in flash at foggypetronasracing.com doesn't work
+
+        * Plugins.subproj/WebPluginStream.h:
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream initWithURL:pluginPointer:notifyData:]): Make the request here and return nil if we can't create a handle with it.
+        (-[WebNetscapePluginStream dealloc]): release the request
+        (-[WebNetscapePluginStream startLoad]): use the request when creating the handle
+
 2002-09-28  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setNeedsLayout]): Added.
diff --git a/WebKit/Plugins.subproj/WebPluginStream.h b/WebKit/Plugins.subproj/WebPluginStream.h
index d3d73f5..198d058 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.h
+++ b/WebKit/Plugins.subproj/WebPluginStream.h
@@ -9,6 +9,7 @@
 
 @class WebDataSource;
 @class WebResourceHandle;
+ at class WebResourceRequest;
 @class WebNetscapePluginView;
 
 @protocol WebDocumentRepresentation;
@@ -26,7 +27,8 @@
     void *notifyData;
     
     BOOL isFirstChunk;
-    
+
+    WebResourceRequest *request;
     WebResourceHandle *resource;
     NSMutableData *resourceData;
     
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index fda30b4..56daf87 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -13,12 +13,13 @@
 #import <WebKit/WebControllerPrivate.h>
 #import <WebKit/WebKitLogging.h>
 
-#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebError.h>
+//#import <WebFoundation/WebAssertions.h>
+//#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebFoundation.h>
 #import <WebFoundation/WebNSFileManagerExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
+//#import <WebFoundation/WebResourceHandle.h>
+//#import <WebFoundation/WebResourceRequest.h>
+//#import <WebFoundation/WebResourceResponse.h>
 
 @interface WebNetscapePluginStream (ClassInternal)
 - (void)receivedData:(NSData *)data withHandle:(WebResourceHandle *)handle;
@@ -61,13 +62,17 @@
 - initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer notifyData:(void *)theNotifyData
 {
     [super init];
-    
-    if(!theURL)
-        return nil;
-    
-    if(!thePluginPointer)
+
+    if(!theURL || !thePluginPointer){
        return nil;
-    
+    }
+
+    request = [[WebResourceRequest alloc] initWithURL:theURL];
+    if(![WebResourceHandle canInitWithRequest:request]){
+        [request release];
+        return nil;
+    }
+       
     view = [(WebNetscapePluginView *)thePluginPointer->ndata retain];
     ASSERT(view);
     URL = [theURL retain];
@@ -94,14 +99,13 @@
     free((void *)npStream.URL);
     [URL release];
     [resourceData release];
+    [request release];
     [super dealloc];
 }
 
 - (void)startLoad
 {
-    WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
     resource = [[WebResourceHandle alloc] initWithRequest:request delegate:self];
-    [request release];
     [[view webController] _didStartLoading:[resource URL]];
 }
 

-- 
WebKit Debian packaging