[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 5d95789f4c7f6ce752bfe3dbf854dc5c683ac93a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 4 01:38:26 2002 +0000

            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge objectLoadedFromCache:size:]):
            Hack to prevent handle creation with nil delegate,
            still perform frame complete check.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient initWithDataSource:]):
            Removed unused code.
    
            (-[WebMainResourceClient handle:willSendRequest:]):
            Copy the request, ugh.
    
            * BrowserWebController.m:
            (-[BrowserWebController resourceRequest:willSendRequest:fromDataSource:]):
            (-[BrowserWebController resourceRequest:didReceiveContentLength:fromDataSource:]):
            (-[BrowserWebController resourceRequest:didFinishLoadingFromDataSource:]):
            Clean up activity value changes.
    
            * FrameProgressEntry.m:
            (-[FrameProgressEntry trackSubresource:withIdentifier:forDataSource:]):
            (-[FrameProgressEntry updateKeyFrom:to:dataSource:]):
            (-[FrameProgressEntry updateSubresource:ofDataSource:withURLString:bytesLoaded:bytesExpected:error:]):
            Update key when request changes.  May be removed if with go with
            opaque identifier.
    
            * LoadProgressMonitor.h:
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor entryForKey:dataSource:]):
            Accessor method for ResourceProgressEntry.
    
            Copy request if a different instance is returned.
    
            * CacheLoader.subproj/WebResourceHandleInternal.m:
            (-[WebResourceHandle _notifyClientWillSendRequest]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index db483c6..d8e4335 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-10-03  Richard Williamson   <rjw at apple.com>
+
+        
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge objectLoadedFromCache:size:]):
+        Hack to prevent handle creation with nil delegate,
+        still perform frame complete check.
+        
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient initWithDataSource:]):
+        Removed unused code.
+        
+        (-[WebMainResourceClient handle:willSendRequest:]):
+        Copy the request, ugh.
+
 2002-10-03  Darin Adler  <darin at apple.com>
 
 	Add API for executing JavaScript.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index db483c6..d8e4335 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-10-03  Richard Williamson   <rjw at apple.com>
+
+        
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge objectLoadedFromCache:size:]):
+        Hack to prevent handle creation with nil delegate,
+        still perform frame complete check.
+        
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient initWithDataSource:]):
+        Removed unused code.
+        
+        (-[WebMainResourceClient handle:willSendRequest:]):
+        Copy the request, ugh.
+
 2002-10-03  Darin Adler  <darin at apple.com>
 
 	Add API for executing JavaScript.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index acc45e2..fc6d7f4 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -172,12 +172,12 @@
 {
     ASSERT(frame != nil);
 
-    WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
-    WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request];
-    [handle loadWithDelegate:nil];
-    [[frame controller] _receivedProgressForResourceHandle:handle fromDataSource:[self dataSource] complete:YES];
-    [handle release];
-    [request release];
+    //WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+    //WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request];
+    //[handle loadWithDelegate:nil];
+    [[frame controller] _receivedProgressForResourceHandle:nil fromDataSource:[self dataSource] complete:YES];
+    //[handle release];
+    //[request release];
 }
 
 - (BOOL)isReloading
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index fa1ee1f..e14383c 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -42,8 +42,6 @@
         // set the user agent for the request
         // consult the data source's controller
         WebController *controller = [dataSource controller];
-        WebResourceRequest *newRequest = [dataSource request];
-        [newRequest setUserAgent:[controller userAgentForURL:[newRequest URL]]];
         resourceProgressDelegate = [[controller resourceProgressDelegate] retain];
     }
 
@@ -208,7 +206,10 @@
 
     [newRequest setUserAgent:[controller userAgentForURL:URL]];
 
-    [dataSource _setRequest:newRequest];
+    // Don't set this on the first request.  It is set
+    // when the main load was started.
+    if (request)
+        [dataSource _setRequest:newRequest];
 
     // Not the first send, so reload.
     if (request) {
@@ -219,9 +220,9 @@
     // Let the resourceProgressDelegate get a crack at modifying the request.
     newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
 
-    [newRequest retain];
-    [request release];
-    request = newRequest;
+    WebResourceRequest *oldRequest = request;
+    request = [newRequest copy];
+    [oldRequest release];
         
     return newRequest;
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index fa1ee1f..e14383c 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -42,8 +42,6 @@
         // set the user agent for the request
         // consult the data source's controller
         WebController *controller = [dataSource controller];
-        WebResourceRequest *newRequest = [dataSource request];
-        [newRequest setUserAgent:[controller userAgentForURL:[newRequest URL]]];
         resourceProgressDelegate = [[controller resourceProgressDelegate] retain];
     }
 
@@ -208,7 +206,10 @@
 
     [newRequest setUserAgent:[controller userAgentForURL:URL]];
 
-    [dataSource _setRequest:newRequest];
+    // Don't set this on the first request.  It is set
+    // when the main load was started.
+    if (request)
+        [dataSource _setRequest:newRequest];
 
     // Not the first send, so reload.
     if (request) {
@@ -219,9 +220,9 @@
     // Let the resourceProgressDelegate get a crack at modifying the request.
     newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
 
-    [newRequest retain];
-    [request release];
-    request = newRequest;
+    WebResourceRequest *oldRequest = request;
+    request = [newRequest copy];
+    [oldRequest release];
         
     return newRequest;
 }

-- 
WebKit Debian packaging