[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:54:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b403a314616647c378e4145fb60f01eb211efe87
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 1 03:12:36 2002 +0000
Added QString constructor, fixed javascript at head of document bug.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1b286ab..e6d6f35 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
2002-01-31 Richard Williamson <rjw at apple.com>
+ Added QString constructor, fixed javascript at head of document bug.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::openURL), (KHTMLPart::closeURL),
+ (KHTMLPart::write):
+ * src/kwq/KWQString.mm: (QString::QString):
+ * src/kwq/qt/qstring.h:
+
+2002-01-31 Richard Williamson <rjw at apple.com>
+
* src/kdelibs/khtml/html/html_headimpl.cpp: (HTMLStyleElementImpl::detach):
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1b286ab..e6d6f35 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
2002-01-31 Richard Williamson <rjw at apple.com>
+ Added QString constructor, fixed javascript at head of document bug.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::openURL), (KHTMLPart::closeURL),
+ (KHTMLPart::write):
+ * src/kwq/KWQString.mm: (QString::QString):
+ * src/kwq/qt/qstring.h:
+
+2002-01-31 Richard Williamson <rjw at apple.com>
+
* src/kdelibs/khtml/html/html_headimpl.cpp: (HTMLStyleElementImpl::detach):
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1b286ab..e6d6f35 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
2002-01-31 Richard Williamson <rjw at apple.com>
+ Added QString constructor, fixed javascript at head of document bug.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::openURL), (KHTMLPart::closeURL),
+ (KHTMLPart::write):
+ * src/kwq/KWQString.mm: (QString::QString):
+ * src/kwq/qt/qstring.h:
+
+2002-01-31 Richard Williamson <rjw at apple.com>
+
* src/kdelibs/khtml/html/html_headimpl.cpp: (HTMLStyleElementImpl::detach):
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 638466b..5505d8b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -342,6 +342,9 @@ bool KHTMLPart::openURL( const KURL &url )
d->m_workingURL = url;
d->m_url = url;
+ d->m_documentSource = "";
+ d->m_decodingStarted = 0;
+
NSString *urlString;
NSURL *theURL;
@@ -380,7 +383,7 @@ bool KHTMLPart::closeURL()
// Reset the the current working URL to the default URL.
d->m_workingURL = KURL();
-
+
//d->m_doc = 0;
return true;
@@ -624,7 +627,8 @@ void KHTMLPart::write(const char *str, int len)
double start = CFAbsoluteTimeGetCurrent();
#endif
- d->m_documentSource += str;
+ // FIX ME: This is very expensive.
+ d->m_documentSource += QString(str, len);
QString decoded;
if (d->m_decodingStarted)
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 638466b..5505d8b 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -342,6 +342,9 @@ bool KHTMLPart::openURL( const KURL &url )
d->m_workingURL = url;
d->m_url = url;
+ d->m_documentSource = "";
+ d->m_decodingStarted = 0;
+
NSString *urlString;
NSURL *theURL;
@@ -380,7 +383,7 @@ bool KHTMLPart::closeURL()
// Reset the the current working URL to the default URL.
d->m_workingURL = KURL();
-
+
//d->m_doc = 0;
return true;
@@ -624,7 +627,8 @@ void KHTMLPart::write(const char *str, int len)
double start = CFAbsoluteTimeGetCurrent();
#endif
- d->m_documentSource += str;
+ // FIX ME: This is very expensive.
+ d->m_documentSource += QString(str, len);
QString decoded;
if (d->m_decodingStarted)
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 91966b1..c5b24f8 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -348,6 +348,7 @@ public:
QString(const QByteArray &);
QString(const QChar *, uint);
QString(const char *);
+ QString(const char *, int len);
QString(const QString &);
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index febc95a..17744c5 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -282,6 +282,24 @@ QString::QString(const char *chs)
cacheType = CacheInvalid;
}
+QString::QString(const char *chs, int len)
+{
+
+ if (len > 0) {
+ CFStringRef tmp;
+ tmp = CFStringCreateWithBytes (kCFAllocatorDefault, (const UInt8 *)chs, len, kCFStringEncodingISOLatin1, false);
+ s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+ if (s) {
+ CFStringAppend(s, tmp);
+ }
+ CFRelease (tmp);
+ } else {
+ s = NULL;
+ }
+ cache = NULL;
+ cacheType = CacheInvalid;
+}
+
QString::QString(const QString &qs)
{
// shared copy
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 91966b1..c5b24f8 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -348,6 +348,7 @@ public:
QString(const QByteArray &);
QString(const QChar *, uint);
QString(const char *);
+ QString(const char *, int len);
QString(const QString &);
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 638466b..5505d8b 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -342,6 +342,9 @@ bool KHTMLPart::openURL( const KURL &url )
d->m_workingURL = url;
d->m_url = url;
+ d->m_documentSource = "";
+ d->m_decodingStarted = 0;
+
NSString *urlString;
NSURL *theURL;
@@ -380,7 +383,7 @@ bool KHTMLPart::closeURL()
// Reset the the current working URL to the default URL.
d->m_workingURL = KURL();
-
+
//d->m_doc = 0;
return true;
@@ -624,7 +627,8 @@ void KHTMLPart::write(const char *str, int len)
double start = CFAbsoluteTimeGetCurrent();
#endif
- d->m_documentSource += str;
+ // FIX ME: This is very expensive.
+ d->m_documentSource += QString(str, len);
QString decoded;
if (d->m_decodingStarted)
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index febc95a..17744c5 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -282,6 +282,24 @@ QString::QString(const char *chs)
cacheType = CacheInvalid;
}
+QString::QString(const char *chs, int len)
+{
+
+ if (len > 0) {
+ CFStringRef tmp;
+ tmp = CFStringCreateWithBytes (kCFAllocatorDefault, (const UInt8 *)chs, len, kCFStringEncodingISOLatin1, false);
+ s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+ if (s) {
+ CFStringAppend(s, tmp);
+ }
+ CFRelease (tmp);
+ } else {
+ s = NULL;
+ }
+ cache = NULL;
+ cacheType = CacheInvalid;
+}
+
QString::QString(const QString &qs)
{
// shared copy
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 91966b1..c5b24f8 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -348,6 +348,7 @@ public:
QString(const QByteArray &);
QString(const QChar *, uint);
QString(const char *);
+ QString(const char *, int len);
QString(const QString &);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list