[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 b3cf3672f98f57ee162bea690d391714a27153ca
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 13 21:35:23 2002 +0000

    	Fix dataSource-related plugin crash.
    
            * Plugins.subproj/WebPluginView.m:
            (-[WebNetscapePluginView start]): Don't grab dataSource here.
    	It's too early.
            (-[WebNetscapePluginView setDataSource:]): Grab it here.
    
            * Plugins.subproj/WebPluginStream.h:
            * Plugins.subproj/WebPluginStream.m:
    	Simplified includes and added asserts while debugging.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 00f1499..88d7e8c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-09-13  Darin Adler  <darin at apple.com>
+
+	Fix dataSource-related plugin crash.
+
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebNetscapePluginView start]): Don't grab dataSource here.
+	It's too early.
+        (-[WebNetscapePluginView setDataSource:]): Grab it here.
+
+        * Plugins.subproj/WebPluginStream.h:
+        * Plugins.subproj/WebPluginStream.m:
+	Simplified includes and added asserts while debugging.
+
 2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
 
         Changed drag hysteresis to 5 and disallow selection initiation within
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 00f1499..88d7e8c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-09-13  Darin Adler  <darin at apple.com>
+
+	Fix dataSource-related plugin crash.
+
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebNetscapePluginView start]): Don't grab dataSource here.
+	It's too early.
+        (-[WebNetscapePluginView setDataSource:]): Grab it here.
+
+        * Plugins.subproj/WebPluginStream.h:
+        * Plugins.subproj/WebPluginStream.m:
+	Simplified includes and added asserts while debugging.
+
 2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
 
         Changed drag hysteresis to 5 and disallow selection initiation within
diff --git a/WebKit/Plugins.subproj/WebPluginStream.h b/WebKit/Plugins.subproj/WebPluginStream.h
index 2c425fc..d3d73f5 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.h
+++ b/WebKit/Plugins.subproj/WebPluginStream.h
@@ -4,12 +4,13 @@
 */
 
 #import <Foundation/Foundation.h>
-#import <WebFoundation/WebFoundation.h>
 
-#import <WebKit/WebKit.h>
-#import <WebKit/WebPluginView.h>
 #import <WebKit/npapi.h>
 
+ at class WebDataSource;
+ at class WebResourceHandle;
+ at class WebNetscapePluginView;
+
 @protocol WebDocumentRepresentation;
 
 @interface WebNetscapePluginStream : NSObject <WebDocumentRepresentation>
@@ -42,4 +43,5 @@
 
 - (void)startLoad;
 - (void)stop;
+
 @end
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 6e56bdb..e65d4c4 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -3,9 +3,10 @@
 	Copyright (c) 2002, Apple, Inc. All rights reserved.
 */
 
-#import <WebKit/npapi.h>
-#import <WebKit/WebLoadProgress.h>
 #import <WebKit/WebPluginStream.h>
+
+#import <WebKit/WebPluginView.h>
+#import <WebKit/WebLoadProgress.h>
 #import <WebKit/WebView.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebDataSourcePrivate.h>
@@ -13,7 +14,9 @@
 #import <WebKit/WebKitLogging.h>
 
 #import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebError.h>
 #import <WebFoundation/WebNSFileManagerExtras.h>
+#import <WebFoundation/WebResourceHandle.h>
 #import <WebFoundation/WebResourceRequest.h>
 #import <WebFoundation/WebResourceResponse.h>
 
@@ -93,6 +96,7 @@
 
 - (void)startLoad
 {
+    ASSERT([view webDataSource]);
     WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
     resource = [[WebResourceHandle alloc] initWithRequest:request client:self];
     [resource loadInBackground];
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index e786ca1..f17e7f5 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -577,7 +577,6 @@
     WebView *webView = (WebView *)[self _web_superviewOfClass:[WebView class]];
     webController = [[webView controller] retain];
     webFrame = 	    [[webController frameForView:webView] retain];
-    webDataSource = [[webFrame dataSource] retain];
     
     if(srcURL){
         stream = [[WebNetscapePluginStream alloc] initWithURL:srcURL pluginPointer:instance];
@@ -657,6 +656,9 @@
 {
     WebNetscapePlugin *plugin;
     
+    [webDataSource release];
+    webDataSource = [dataSource retain];
+    
     mime = [[dataSource contentType] retain];
     plugin = [[WebNetscapePluginDatabase installedPlugins] pluginForMimeType:mime];
     

-- 
WebKit Debian packaging