[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 c12a035032f78f11a4b2efafaef55455b28acbeb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 15 16:40:09 2003 +0000

    WebCore:
    
            Reviewed by Ken.
    
    	- fixed problem where Content-Type was coming in with suffixes like "charset"
    
            * kwq/WebCoreBridge.h: Add contentType and refresh parameters, and remove "headers"
    	parameter, from openURL method.
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge openURL:reload:contentType:refresh:lastModified:pageCache:]): Get the
    	content type from a parameter, and the refresh header from a separate parameter rather
    	than extracting both from a headers dictionary.
    
    WebKit:
    
            Reviewed by Ken.
    
    	- fixed problem where Content-Type was going into WebCore with suffixes like "charset"
    
            * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _commitIfReady:]):
    	Pass in contentType from the response, rather than the "Content-Type" header.
    	Also pass in the refresh header separately.
    
            * English.lproj/StringsNotToBeLocalized.txt: Updated for above change.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3326 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 15ae2d5..e92971e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-01-15  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+	- fixed problem where Content-Type was coming in with suffixes like "charset"
+
+        * kwq/WebCoreBridge.h: Add contentType and refresh parameters, and remove "headers"
+	parameter, from openURL method.
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge openURL:reload:contentType:refresh:lastModified:pageCache:]): Get the
+	content type from a parameter, and the refresh header from a separate parameter rather
+	than extracting both from a headers dictionary.
+
 2003-01-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 15ae2d5..e92971e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-01-15  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+	- fixed problem where Content-Type was coming in with suffixes like "charset"
+
+        * kwq/WebCoreBridge.h: Add contentType and refresh parameters, and remove "headers"
+	parameter, from openURL method.
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge openURL:reload:contentType:refresh:lastModified:pageCache:]): Get the
+	content type from a parameter, and the refresh header from a separate parameter rather
+	than extracting both from a headers dictionary.
+
 2003-01-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 99c507d..cc7304e 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -100,7 +100,9 @@ enum FrameBorderStyle {
 
 - (void)setParent:(WebCoreBridge *)parent;
 
-- (void)openURL:(NSString *)URL reload:(BOOL)reload headers:(NSDictionary *)headers lastModified:(NSDate *)lastModified pageCache:(NSDictionary *)pageCache;
+- (void)openURL:(NSString *)URL reload:(BOOL)reload
+    contentType:(NSString *)contentType refresh:(NSString *)refresh lastModified:(NSDate *)lastModified
+    pageCache:(NSDictionary *)pageCache;
 - (void)addData:(NSData *)data withEncoding:(NSString *)encoding;
 - (void)addData:(NSData *)data withOverrideEncoding:(NSString *)encoding;
 - (void)closeURL;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 59e16df..8ee2a87 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -138,7 +138,7 @@ static bool initializedObjectCacheSize = FALSE;
     _part->setParent([parent part]);
 }
 
-- (void)openURL:(NSString *)URL reload:(BOOL)reload headers:(NSDictionary *)headers lastModified:(NSDate *)lastModified pageCache:(NSDictionary *)pageCache
+- (void)openURL:(NSString *)URL reload:(BOOL)reload contentType:(NSString *)contentType refresh:(NSString *)refresh lastModified:(NSDate *)lastModified pageCache:(NSDictionary *)pageCache
 {
     if (pageCache) {
         KWQPageState *state = [pageCache objectForKey:@"WebCorePageState"];
@@ -150,7 +150,6 @@ static bool initializedObjectCacheSize = FALSE;
     // arguments
     URLArgs args(_part->browserExtension()->urlArgs());
     args.reload = reload;
-    NSString *contentType = [headers objectForKey:@"Content-Type"];
     if (contentType) {
         args.serviceType = QString::fromNSString(contentType);
     }
@@ -160,9 +159,8 @@ static bool initializedObjectCacheSize = FALSE;
     _part->didOpenURL([URL cString]);
 
     // things we have to set up after calling didOpenURL
-    NSString *refreshHeader = [headers objectForKey:@"Refresh"];
-    if (refreshHeader) {
-        _part->addMetaData("http-refresh", QString::fromNSString(refreshHeader));
+    if (refresh) {
+        _part->addMetaData("http-refresh", QString::fromNSString(refresh));
     }
     if (lastModified) {
 	_part->addMetaData("modified", QString::fromNSString([lastModified description]));
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d81eb2e..cfcd978 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-01-15  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+	- fixed problem where Content-Type was going into WebCore with suffixes like "charset"
+
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _commitIfReady:]):
+	Pass in contentType from the response, rather than the "Content-Type" header.
+	Also pass in the refresh header separately.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Updated for above change.
+
 2003-01-13  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin, Dave and Trey, and given the seal of approval by Don.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 4b6c733..88c48c8 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -251,5 +251,6 @@ WebCoreSupport.subproj/WebBridge.m:"height"
 WebCoreSupport.subproj/WebBridge.m:"width"
 WebCoreSupport.subproj/WebCookieAdapter.m:"Cookie"
 WebCoreSupport.subproj/WebTextRenderer.m:"YES"
+WebView.subproj/WebDataSourcePrivate.m:"Refresh"
 WebView.subproj/WebPreferences.m:"latin1"
 WebView.subproj/WebRenderNode.m
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index db1210f..cf6f1d6 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -481,10 +481,11 @@
 	}
 
         [[self _bridge] openURL:urlString
-                reload:reload 
-                headers:headers 
-                lastModified: (pageCache ? nil : [_private->response lastModifiedDate])
-                pageCache: pageCache];
+                         reload:reload 
+                    contentType:[_private->response contentType]
+                        refresh:[headers objectForKey:@"Refresh"]
+                   lastModified:(pageCache ? nil : [_private->response lastModifiedDate])
+                      pageCache:pageCache];
 
         [[self webFrame] _opened];
     }

-- 
WebKit Debian packaging