[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:35:47 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9a55ff1fafb770d8cc1559d8a872e9f0e5d1db9e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Aug 31 16:44:27 2002 +0000
- fixed 3038336 -- repro crash in QTextDecoder trying to display UTF-16 file
* kwq/mac-encodings.txt: Hook up the UTF-16 encoding to the name iso-10646-ucs-2.
We have a long way to go to get this right. There are almost certainly going to
be other bugs with 16-bit character pages.
* kwq/KWQKHTMLSettings.mm: (KHTMLSettings::encoding): Just return "latin1",
not "NSISOLatin1StringEncoding".
* kwq/KWQString.mm: (QString::fromStringWithEncoding): Pass true for the
"pay attention to BOM" flag.
* khtml/rendering/render_object.cpp: Take out unneeded APPLE_CHANGES.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1948 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 65e7952..e308002 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-08-31 Darin Adler <darin at apple.com>
+
+ - fixed 3038336 -- repro crash in QTextDecoder trying to display UTF-16 file
+
+ * kwq/mac-encodings.txt: Hook up the UTF-16 encoding to the name iso-10646-ucs-2.
+ We have a long way to go to get this right. There are almost certainly going to
+ be other bugs with 16-bit character pages.
+
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::encoding): Just return "latin1",
+ not "NSISOLatin1StringEncoding".
+
+ * kwq/KWQString.mm: (QString::fromStringWithEncoding): Pass true for the
+ "pay attention to BOM" flag.
+
+ * khtml/rendering/render_object.cpp: Take out unneeded APPLE_CHANGES.
+
2002-08-30 Ken Kocienda <kocienda at apple.com>
Fixed a problem in this function where broken UTF-8 would cause a crash.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 65e7952..e308002 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-08-31 Darin Adler <darin at apple.com>
+
+ - fixed 3038336 -- repro crash in QTextDecoder trying to display UTF-16 file
+
+ * kwq/mac-encodings.txt: Hook up the UTF-16 encoding to the name iso-10646-ucs-2.
+ We have a long way to go to get this right. There are almost certainly going to
+ be other bugs with 16-bit character pages.
+
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::encoding): Just return "latin1",
+ not "NSISOLatin1StringEncoding".
+
+ * kwq/KWQString.mm: (QString::fromStringWithEncoding): Pass true for the
+ "pay attention to BOM" flag.
+
+ * khtml/rendering/render_object.cpp: Take out unneeded APPLE_CHANGES.
+
2002-08-30 Ken Kocienda <kocienda at apple.com>
Fixed a problem in this function where broken UTF-8 would cause a crash.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 65e7952..e308002 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2002-08-31 Darin Adler <darin at apple.com>
+
+ - fixed 3038336 -- repro crash in QTextDecoder trying to display UTF-16 file
+
+ * kwq/mac-encodings.txt: Hook up the UTF-16 encoding to the name iso-10646-ucs-2.
+ We have a long way to go to get this right. There are almost certainly going to
+ be other bugs with 16-bit character pages.
+
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::encoding): Just return "latin1",
+ not "NSISOLatin1StringEncoding".
+
+ * kwq/KWQString.mm: (QString::fromStringWithEncoding): Pass true for the
+ "pay attention to BOM" flag.
+
+ * khtml/rendering/render_object.cpp: Take out unneeded APPLE_CHANGES.
+
2002-08-30 Ken Kocienda <kocienda at apple.com>
Fixed a problem in this function where broken UTF-8 would cause a crash.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index d2c19ef..eb8b96c 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -241,12 +241,11 @@ void RenderObject::drawBorder(QPainter *p, int x1, int y1, int x2, int y2,
case BSBottom:
case BSTop:
p->drawLine(x1, (y1+y2)/2, x2, (y1+y2)/2);
-#ifdef APPLE_CHANGES
break;
-#endif
case BSRight:
case BSLeft:
p->drawLine((x1+x2)/2, y1, (x1+x2)/2, y2);
+ break;
}
}
break;
@@ -1003,12 +1002,8 @@ void RenderObject::recalcMinMaxWidths()
// gcc sucks. if anybody knows a trick to get rid of the
// warning without adding an extra (unneeded) initialisation,
// go ahead
-#ifdef APPLE_CHANGES
int cmin = 0;
int cmax = 0;
-#else /* not APPLE_CHANGES */
- int cmin, cmax;
-#endif /* not APPLE_CHANGES */
bool test = false;
if ( ( m_minMaxKnown && child->m_recalcMinMax ) || !child->m_minMaxKnown ) {
cmin = child->minWidth();
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index 79e88bc..b57e4e3 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -58,16 +58,13 @@ QString KHTMLSettings::fantasyFontName() const
QString KHTMLSettings::settingsToCSS() const
{
- _logNotYetImplemented();
- return QString();
+ return QString::null;
}
const QString &KHTMLSettings::encoding() const
{
- // FIXME: remove this hack
- _logNotYetImplemented();
- static const QString e(QString::fromNSString(@"NSISOLatin1StringEncoding"));
- return e;
+ static QString latin1("latin1");
+ return latin1;
}
int KHTMLSettings::minFontSize() const
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 03c1c25..e43d8a8 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -734,7 +734,7 @@ QString QString::fromStringWithEncoding(const char *chs, int len, CFStringEncodi
QString qs;
if (chs && len > 0) {
- CFStringRef s = CFStringCreateWithBytes (kCFAllocatorDefault, (const UInt8 *)chs, len, encoding, false);
+ CFStringRef s = CFStringCreateWithBytes(kCFAllocatorDefault, (const UInt8 *)chs, len, encoding, true);
if (s) {
qs.setBufferFromCFString(s);
CFRelease(s);
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index 332bd72..ac6aaa4 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -8,7 +8,7 @@ WindowsLatin1: windows-1252, x-ansi
ISOLatin1: iso-8859-1, iso8859-1
NextStepLatin: x-nextstep
ASCII: iso-ir-6us, us-ascii
-Unicode # utf-16be, unicodeFFFE, unicode? (would this help us?)
+Unicode: iso-10646-ucs-2 # utf-16be, unicodeFFFE, unicode? (would this help us?)
# Note the bogus entry to make UTF-16 mean UTF-8.
# We do this because Internet Explorer does, and because web pages say UTF-16 and mean UTF-8.
# See bug 2969378 and http://zingermans.com/ for a concrete example.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list