[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 4f45b41a3eee0261e8499fd50265e20cc02f6978
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 30 18:09:08 2002 +0000

            * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithRequest:]):
    	Remove the ill-advised "don't even create a WebDataSource if WebResourceHandle
    	can't handle this request" code.
    
            * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading]):
    	Rearrange checks so we won't get confused if we can't create a handle.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bc0db7a..4ef35e2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-09-30  Darin Adler  <darin at apple.com>
 
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithRequest:]):
+	Remove the ill-advised "don't even create a WebDataSource if WebResourceHandle
+	can't handle this request" code.
+
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading]):
+	Rearrange checks so we won't get confused if we can't create a handle.
+
+2002-09-30  Darin Adler  <darin at apple.com>
+
         * English.lproj/StringsNotToBeLocalized.txt: Added.
 
 2002-09-30  Darin Adler  <darin at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index bc0db7a..4ef35e2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-09-30  Darin Adler  <darin at apple.com>
 
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithRequest:]):
+	Remove the ill-advised "don't even create a WebDataSource if WebResourceHandle
+	can't handle this request" code.
+
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading]):
+	Rearrange checks so we won't get confused if we can't create a handle.
+
+2002-09-30  Darin Adler  <darin at apple.com>
+
         * English.lproj/StringsNotToBeLocalized.txt: Added.
 
 2002-09-30  Darin Adler  <darin at apple.com>
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 139dc91..cc5a31b 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -41,10 +41,6 @@
 
 -(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 89b5a97..0f688fa 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -182,8 +182,7 @@
     
     [[_private->controller locationChangeDelegate] locationChangeStartedForDataSource:self];
 
-    // Fire this guy up.
-    if (!_private->mainHandle) {
+    if (!_private->mainClient) {
         _private->mainClient = [[WebMainResourceClient alloc] initWithDataSource:self];
 
 	if ([self webFrame] == [[self controller] mainFrame]) {
@@ -193,10 +192,11 @@
 	}
 
         _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:_private->request delegate:_private->mainClient];
-        
-        ASSERT(_private->mainHandle);
     }
-    [_private->mainClient didStartLoadingWithURL:[_private->mainHandle URL]];
+    
+    if (_private->mainHandle) {
+        [_private->mainClient didStartLoadingWithURL:[_private->mainHandle URL]];
+    }
 }
 
 - (void)_addSubresourceClient:(WebSubresourceClient *)client

-- 
WebKit Debian packaging