[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:58:37 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 78c09020e6a55d5f51456ebb6707b410a012607a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Mar 24 22:48:10 2002 +0000
A number of fixes to support non-latin1 decoding
and font measurement/drawing.
Changed data source to create IFURLHandle of the appropriate class.
The prevented us from getting the response headers correctly.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@834 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 71406f7..24458d0 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
2002-03-24 Richard Williamson <rjw at apple.com>
+ A number of fixes to support non-latin1 decoding
+ and font measurement/drawing.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData):
+ * src/kwq/KWQMetrics.h:
+
+2002-03-24 Richard Williamson <rjw at apple.com>
+
Cached available families from NSFontManager.
http://www.gamespy.com/gdc2002/okamoto went from 4.8 seconds
to 0.7 seconds. [Do we need to worry about updating the cache if
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 71406f7..24458d0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
2002-03-24 Richard Williamson <rjw at apple.com>
+ A number of fixes to support non-latin1 decoding
+ and font measurement/drawing.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData):
+ * src/kwq/KWQMetrics.h:
+
+2002-03-24 Richard Williamson <rjw at apple.com>
+
Cached available families from NSFontManager.
http://www.gamespy.com/gdc2002/okamoto went from 4.8 seconds
to 0.7 seconds. [Do we need to worry about updating the cache if
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 71406f7..24458d0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
2002-03-24 Richard Williamson <rjw at apple.com>
+ A number of fixes to support non-latin1 decoding
+ and font measurement/drawing.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::slotData):
+ * src/kwq/KWQMetrics.h:
+
+2002-03-24 Richard Williamson <rjw at apple.com>
+
Cached available families from NSFontManager.
http://www.gamespy.com/gdc2002/okamoto went from 4.8 seconds
to 0.7 seconds. [Do we need to worry about updating the cache if
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 451c206..b709f2f 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -607,7 +607,7 @@ static NSRect _rectForString (KWQLayoutInfo *self, const UniChar *internalBuffer
for (blockID = blockStart; blockID < blockEnd; blockID++)
sequentialGlyphs[blockID-blockStart] = blockID;
- errorResult = CGFontGetGlyphScaledAdvances ([font _backingCGSFont], &sequentialGlyphs[0], blockEnd-blockStart, &widthCache[blockID], [font pointSize]);
+ errorResult = CGFontGetGlyphScaledAdvances ([font _backingCGSFont], &sequentialGlyphs[0], blockEnd-blockStart, &widthCache[blockStart], [font pointSize]);
if (errorResult == 0)
[NSException raise:NSInternalInconsistencyException format:@"Optimization assumption violation: unable to cache glyph widths - for %@ %f", self, [font displayName], [font pointSize]];
}
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 5633032..7b30c60 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -459,7 +459,7 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaders:)]) {
+ if (d->m_encoding.isNull() && [handle respondsToSelector:@selector(responseHeaders)]) {
encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
if (encoding != NULL) {
enc = QString::fromCFString((CFStringRef) encoding);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 5633032..7b30c60 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -459,7 +459,7 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaders:)]) {
+ if (d->m_encoding.isNull() && [handle respondsToSelector:@selector(responseHeaders)]) {
encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
if (encoding != NULL) {
enc = QString::fromCFString((CFStringRef) encoding);
diff --git a/WebCore/kwq/KWQMetrics.h b/WebCore/kwq/KWQMetrics.h
index 028a877..c544179 100644
--- a/WebCore/kwq/KWQMetrics.h
+++ b/WebCore/kwq/KWQMetrics.h
@@ -35,7 +35,7 @@
#define LOCAL_GLYPH_BUFFER_SIZE 1024
#define INITIAL_GLYPH_CACHE_MAX 512
-#define INCREMENTAL_GLYPH_CACHE_BLOCK 512
+#define INCREMENTAL_GLYPH_CACHE_BLOCK 1024
#define UNITIALIZED_GLYPH_WIDTH 65535
diff --git a/WebCore/src/kwq/KWQFontMetrics.mm b/WebCore/src/kwq/KWQFontMetrics.mm
index 451c206..b709f2f 100644
--- a/WebCore/src/kwq/KWQFontMetrics.mm
+++ b/WebCore/src/kwq/KWQFontMetrics.mm
@@ -607,7 +607,7 @@ static NSRect _rectForString (KWQLayoutInfo *self, const UniChar *internalBuffer
for (blockID = blockStart; blockID < blockEnd; blockID++)
sequentialGlyphs[blockID-blockStart] = blockID;
- errorResult = CGFontGetGlyphScaledAdvances ([font _backingCGSFont], &sequentialGlyphs[0], blockEnd-blockStart, &widthCache[blockID], [font pointSize]);
+ errorResult = CGFontGetGlyphScaledAdvances ([font _backingCGSFont], &sequentialGlyphs[0], blockEnd-blockStart, &widthCache[blockStart], [font pointSize]);
if (errorResult == 0)
[NSException raise:NSInternalInconsistencyException format:@"Optimization assumption violation: unable to cache glyph widths - for %@ %f", self, [font displayName], [font pointSize]];
}
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 5633032..7b30c60 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -459,7 +459,7 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaders:)]) {
+ if (d->m_encoding.isNull() && [handle respondsToSelector:@selector(responseHeaders)]) {
encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
if (encoding != NULL) {
enc = QString::fromCFString((CFStringRef) encoding);
diff --git a/WebCore/src/kwq/KWQMetrics.h b/WebCore/src/kwq/KWQMetrics.h
index 028a877..c544179 100644
--- a/WebCore/src/kwq/KWQMetrics.h
+++ b/WebCore/src/kwq/KWQMetrics.h
@@ -35,7 +35,7 @@
#define LOCAL_GLYPH_BUFFER_SIZE 1024
#define INITIAL_GLYPH_CACHE_MAX 512
-#define INCREMENTAL_GLYPH_CACHE_BLOCK 512
+#define INCREMENTAL_GLYPH_CACHE_BLOCK 1024
#define UNITIALIZED_GLYPH_WIDTH 65535
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 80801d0..7e581bf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
2002-03-24 Richard Williamson <rjw at apple.com>
+ Changed data source to create IFURLHandle of the appropriate class.
+ The prevented us from getting the response headers correctly.
+
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _startLoading:]):
+
+2002-03-24 Richard Williamson <rjw at apple.com>
+
Removed erroneous comments.
* WebView.subproj/IFWebView.mm: (-[IFWebView dataSourceChanged:]), (-[IFWebView
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 80801d0..7e581bf 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
2002-03-24 Richard Williamson <rjw at apple.com>
+ Changed data source to create IFURLHandle of the appropriate class.
+ The prevented us from getting the response headers correctly.
+
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _startLoading:]):
+
+2002-03-24 Richard Williamson <rjw at apple.com>
+
Removed erroneous comments.
* WebView.subproj/IFWebView.mm: (-[IFWebView dataSourceChanged:]), (-[IFWebView
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 5120416..aa14378 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -104,7 +104,8 @@
// The handle will be released by the client upon receipt of a
// terminal callback.
- handle = [[IFURLHandle alloc] initWithURL:theURL];
+ Class urlClass = [IFURLHandle URLHandleClassForURL: theURL];
+ handle = [[urlClass alloc] initWithURL:theURL];
[handle addClient: data->mainURLHandleClient];
[handle loadInBackground];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 5120416..aa14378 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -104,7 +104,8 @@
// The handle will be released by the client upon receipt of a
// terminal callback.
- handle = [[IFURLHandle alloc] initWithURL:theURL];
+ Class urlClass = [IFURLHandle URLHandleClassForURL: theURL];
+ handle = [[urlClass alloc] initWithURL:theURL];
[handle addClient: data->mainURLHandleClient];
[handle loadInBackground];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list