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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit d77f910118658c6bc43cd9e6e1b1ed09f3c75287
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 9 16:38:39 2002 +0000

    	WebResourcehandle no longer has a contentType method.
    	Call through to WebResourceResponse object to get content type.
    
            * Plugins.subproj/WebPluginStream.m:
            (-[WebNetscapePluginStream receivedData:withHandle:]):
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleDidReceiveData:data:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2005 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a488717..b49a0cd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-09  Ken Kocienda  <kocienda at apple.com>
+
+	WebResourcehandle no longer has a contentType method.
+	Call through to WebResourceResponse object to get content type.
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream receivedData:withHandle:]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidReceiveData:data:]):
+
 2002-09-09  Darin Adler  <darin at apple.com>
 
 	Fixed lifetime problems happening due to new cancel mechanism.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a488717..b49a0cd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-09-09  Ken Kocienda  <kocienda at apple.com>
+
+	WebResourcehandle no longer has a contentType method.
+	Call through to WebResourceResponse object to get content type.
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream receivedData:withHandle:]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidReceiveData:data:]):
+
 2002-09-09  Darin Adler  <darin at apple.com>
 
 	Fixed lifetime problems happening due to new cancel mechanism.
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index c8e1f82..9c567bc 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -15,6 +15,7 @@
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebNSFileManagerExtras.h>
 #import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebResourceResponse.h>
 
 @interface WebNetscapePluginStream (ClassInternal)
 - (void)receivedData:(NSData *)data withHandle:(WebResourceHandle *)handle;
@@ -119,7 +120,7 @@
 {    
     if(isFirstChunk){
 
-        NSString *mimeType = [handle contentType];
+        NSString *mimeType = [[handle response] contentType];
         NSString *URLString = [[handle URL] absoluteString];
         char *cURL = (char *)malloc([URLString cStringLength]+1);
         [URLString getCString:cURL];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index a3ba365..6d01b46 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -181,7 +181,7 @@
 - (void)handleDidReceiveData:(WebResourceHandle *)handle data:(NSData *)data
 {
     WebController *controller = [dataSource controller];
-    NSString *contentType = [handle contentType];
+    NSString *contentType = [[handle response] contentType];
     WebFrame *frame = [dataSource webFrame];
     
     LOG(Loading, "URL = %@, data = %p, length %d", [handle URL], data, [data length]);
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index a3ba365..6d01b46 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -181,7 +181,7 @@
 - (void)handleDidReceiveData:(WebResourceHandle *)handle data:(NSData *)data
 {
     WebController *controller = [dataSource controller];
-    NSString *contentType = [handle contentType];
+    NSString *contentType = [[handle response] contentType];
     WebFrame *frame = [dataSource webFrame];
     
     LOG(Loading, "URL = %@, data = %p, length %d", [handle URL], data, [data length]);

-- 
WebKit Debian packaging