[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 3d8ceaf3d5796c8858f004ea73648071eebc3dc3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 28 19:49:06 2002 +0000

            * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithRequest:]):
    	Catch a request that we can't use here instead of failing later.
    
            * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading]):
    	Added an assert so the failure was less confusing; good idea to leave it in.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2199 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 15335b1..0622673 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,13 +1,23 @@
+2002-09-28  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithRequest:]):
+	Catch a request that we can't use here instead of failing later.
+
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading]):
+	Added an assert so the failure was less confusing; good idea to leave it in.
+
 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. 
+	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 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
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 15335b1..0622673 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,13 +1,23 @@
+2002-09-28  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithRequest:]):
+	Catch a request that we can't use here instead of failing later.
+
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading]):
+	Added an assert so the failure was less confusing; good idea to leave it in.
+
 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. 
+	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 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
 
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 4c00db8..45fff4e 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -41,6 +41,10 @@
 
 -(id)initWithRequest:(WebResourceRequest *)request
 {
+    if (![WebResourceHandle canInitWithRequest:request]) {
+        return nil;
+    }
+    
     self = [super init];
     if (!self) {
         return nil;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index ce6da65..215c30e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -193,6 +193,8 @@
 	}
 
         _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:_private->request delegate:_private->mainClient];
+        
+        ASSERT(_private->mainHandle);
     }
     [_private->mainClient didStartLoadingWithURL:[_private->mainHandle URL]];
 }

-- 
WebKit Debian packaging