[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:58:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3fcb5aeb759d86145b761ed00672c5fa42958666
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 26 01:40:34 2002 +0000
WebFoundation:
* CacheLoader.subproj/IFURLHandle.m (-[IFURLHandle
initWithURL:attributes:flags:]): Instantiate the right concrete
subclass.
WebCore:
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData): Use
-[IFURLHandle characterSet] to get the character set, instead of
parsing it out of the header by hand.
WebKit:
* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource
_startLoading:]): Just create an IFURLHandle, since it now creates
the proper concrete subclass automagically.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@847 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f279fb1..5ad6893 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-03-25 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData): Use
+ -[IFURLHandle characterSet] to get the character set, instead of
+ parsing it out of the header by hand.
+
2002-03-25 Chris Blumenberg <cblu at apple.com>
* src/kwq/WCPlugin.mm: (-[WCPlugin load]):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f279fb1..5ad6893 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-03-25 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData): Use
+ -[IFURLHandle characterSet] to get the character set, instead of
+ parsing it out of the header by hand.
+
2002-03-25 Chris Blumenberg <cblu at apple.com>
* src/kwq/WCPlugin.mm: (-[WCPlugin load]):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f279fb1..5ad6893 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-03-25 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData): Use
+ -[IFURLHandle characterSet] to get the character set, instead of
+ parsing it out of the header by hand.
+
2002-03-25 Chris Blumenberg <cblu at apple.com>
* src/kwq/WCPlugin.mm: (-[WCPlugin load]):
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index b45d01e..38ae8e3 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -208,27 +208,6 @@ public:
};
-static NSString *
-encodingFromContentType (NSString *contentType)
-{
- NSRange range;
- NSString *result = nil;
-
- if (contentType == nil) {
- return result;
- }
-
- range = [contentType rangeOfString:@"charset="];
-
- if (range.length != 0) {
- result = [contentType substringFromIndex:range.location+range.length];
- }
-
- result = [[result componentsSeparatedByString:@";"] objectAtIndex:0];
-
- return result;
-}
-
static QString splitUrlTarget(const QString &url, QString *target=0)
{
QString result = url;
@@ -459,12 +438,10 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (d->m_encoding.isNull() && [handle respondsToSelector:@selector(responseHeaders)]) {
- encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
- if (encoding != NULL) {
- enc = QString::fromCFString((CFStringRef) encoding);
- setEncoding (enc, true);
- }
+ encoding = [handle characterSet];
+ if (encoding != NULL) {
+ enc = QString::fromCFString((CFStringRef) encoding);
+ setEncoding(enc, true);
}
write(bytes, length);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index b45d01e..38ae8e3 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -208,27 +208,6 @@ public:
};
-static NSString *
-encodingFromContentType (NSString *contentType)
-{
- NSRange range;
- NSString *result = nil;
-
- if (contentType == nil) {
- return result;
- }
-
- range = [contentType rangeOfString:@"charset="];
-
- if (range.length != 0) {
- result = [contentType substringFromIndex:range.location+range.length];
- }
-
- result = [[result componentsSeparatedByString:@";"] objectAtIndex:0];
-
- return result;
-}
-
static QString splitUrlTarget(const QString &url, QString *target=0)
{
QString result = url;
@@ -459,12 +438,10 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (d->m_encoding.isNull() && [handle respondsToSelector:@selector(responseHeaders)]) {
- encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
- if (encoding != NULL) {
- enc = QString::fromCFString((CFStringRef) encoding);
- setEncoding (enc, true);
- }
+ encoding = [handle characterSet];
+ if (encoding != NULL) {
+ enc = QString::fromCFString((CFStringRef) encoding);
+ setEncoding(enc, true);
}
write(bytes, length);
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index b45d01e..38ae8e3 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -208,27 +208,6 @@ public:
};
-static NSString *
-encodingFromContentType (NSString *contentType)
-{
- NSRange range;
- NSString *result = nil;
-
- if (contentType == nil) {
- return result;
- }
-
- range = [contentType rangeOfString:@"charset="];
-
- if (range.length != 0) {
- result = [contentType substringFromIndex:range.location+range.length];
- }
-
- result = [[result componentsSeparatedByString:@";"] objectAtIndex:0];
-
- return result;
-}
-
static QString splitUrlTarget(const QString &url, QString *target=0)
{
QString result = url;
@@ -459,12 +438,10 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (d->m_encoding.isNull() && [handle respondsToSelector:@selector(responseHeaders)]) {
- encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
- if (encoding != NULL) {
- enc = QString::fromCFString((CFStringRef) encoding);
- setEncoding (enc, true);
- }
+ encoding = [handle characterSet];
+ if (encoding != NULL) {
+ enc = QString::fromCFString((CFStringRef) encoding);
+ setEncoding(enc, true);
}
write(bytes, length);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ed6f76f..7e91811 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-25 Maciej Stachowiak <mjs at apple.com>
+
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource
+ _startLoading:]): Just create an IFURLHandle, since it now creates
+ the proper concrete subclass automagically.
+
2002-03-25 Chris Blumenberg <cblu at apple.com>
* MIME.subproj/IFMIMEDatabase.m: (+[IFMIMEDatabase sharedMIMEDatabase]),
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ed6f76f..7e91811 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-03-25 Maciej Stachowiak <mjs at apple.com>
+
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource
+ _startLoading:]): Just create an IFURLHandle, since it now creates
+ the proper concrete subclass automagically.
+
2002-03-25 Chris Blumenberg <cblu at apple.com>
* MIME.subproj/IFMIMEDatabase.m: (+[IFMIMEDatabase sharedMIMEDatabase]),
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index aa14378..5120416 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -104,8 +104,7 @@
// The handle will be released by the client upon receipt of a
// terminal callback.
- Class urlClass = [IFURLHandle URLHandleClassForURL: theURL];
- handle = [[urlClass alloc] initWithURL:theURL];
+ handle = [[IFURLHandle alloc] initWithURL:theURL];
[handle addClient: data->mainURLHandleClient];
[handle loadInBackground];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index aa14378..5120416 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -104,8 +104,7 @@
// The handle will be released by the client upon receipt of a
// terminal callback.
- Class urlClass = [IFURLHandle URLHandleClassForURL: theURL];
- handle = [[urlClass alloc] initWithURL:theURL];
+ handle = [[IFURLHandle alloc] initWithURL:theURL];
[handle addClient: data->mainURLHandleClient];
[handle loadInBackground];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list