[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 06:28:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0ee66775f851795d146793503413513fa21477b6
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 1 09:59:12 2002 +0000
Restored the original KHTMLPart::write() now that none of our
changes in the impl version are beneficial in any way.
* khtml/khtml_part.cpp:
(KHTMLPart::write): Restore original code in lieue of calling impl
version.
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::openURL): Remove initialization of
m_decodingStarted, since it is now gone.
(KWQKHTMLPartImpl::write): Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1711 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 06016eb..2aa12b6 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,19 @@
2002-08-01 Maciej Stachowiak <mjs at apple.com>
+ Restored the original KHTMLPart::write() now that none of our
+ changes in the impl version are beneficial in any way.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::write): Restore original code in lieue of calling impl
+ version.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURL): Remove initialization of
+ m_decodingStarted, since it is now gone.
+ (KWQKHTMLPartImpl::write): Removed.
+
+2002-08-01 Maciej Stachowiak <mjs at apple.com>
+
Removed m_documentSource and remaining ill-conceived uses thereof.
* kwq/KWQKHTMLPartImpl.h:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 06016eb..2aa12b6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
2002-08-01 Maciej Stachowiak <mjs at apple.com>
+ Restored the original KHTMLPart::write() now that none of our
+ changes in the impl version are beneficial in any way.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::write): Restore original code in lieue of calling impl
+ version.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURL): Remove initialization of
+ m_decodingStarted, since it is now gone.
+ (KWQKHTMLPartImpl::write): Removed.
+
+2002-08-01 Maciej Stachowiak <mjs at apple.com>
+
Removed m_documentSource and remaining ill-conceived uses thereof.
* kwq/KWQKHTMLPartImpl.h:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 06016eb..2aa12b6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
2002-08-01 Maciej Stachowiak <mjs at apple.com>
+ Restored the original KHTMLPart::write() now that none of our
+ changes in the impl version are beneficial in any way.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::write): Restore original code in lieue of calling impl
+ version.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURL): Remove initialization of
+ m_decodingStarted, since it is now gone.
+ (KWQKHTMLPartImpl::write): Removed.
+
+2002-08-01 Maciej Stachowiak <mjs at apple.com>
+
Removed m_documentSource and remaining ill-conceived uses thereof.
* kwq/KWQKHTMLPartImpl.h:
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 5a92f57..625f576 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1392,9 +1392,6 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
void KHTMLPart::write( const char *str, int len )
{
-#ifdef APPLE_CHANGES
- impl->write(str, len);
-#else
if ( !d->m_decoder ) {
d->m_decoder = new khtml::Decoder();
if(d->m_encoding != QString::null)
@@ -1428,7 +1425,6 @@ void KHTMLPart::write( const char *str, int len )
Tokenizer* t = d->m_doc->tokenizer();
if(t)
t->write( decoded, true );
-#endif // APPLE_CHANGES
}
void KHTMLPart::write( const QString &str )
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 012cb95..eb427b1 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -118,7 +118,6 @@ private:
int m_redirectionTimer;
KURL m_baseURL;
- bool m_decodingStarted;
friend class KHTMLPart;
};
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 68813fa..b29561e 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -92,8 +92,6 @@ void KWQKHTMLPartImpl::openURL(const KURL &url)
{
d->m_workingURL = url;
part->m_url = url;
-
- m_decodingStarted = false;
}
void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int length, bool complete)
@@ -204,81 +202,6 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
}
// FIXME: Need to remerge this with code in khtml_part.cpp?
-void KWQKHTMLPartImpl::write( const char *str, int len )
-{
- /* FIXME: hook this code back when we have decoders completely working */
-#if 0
- if(d->m_bFirstData) {
- // determine the parse mode
- d->m_doc->determineParseMode( decoded );
- d->m_bFirstData = false;
-
- //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
- // ### this is still quite hacky, but should work a lot better than the old solution
- if(d->m_decoder->visuallyOrdered()) d->m_doc->setVisuallyOrdered();
-
- if (!d->m_haveCharset)
- {
- const QTextCodec *c = d->m_decoder->codec();
- //kdDebug(6005) << "setting up charset to " << (int) KGlobal::charsets()->charsetForEncoding(c->name()) << endl;
- d->m_charset = KGlobal::charsets()->charsetForEncoding(c->name());
- d->m_settings->setCharset( d->m_charset );
- d->m_settings->setScript( KGlobal::charsets()->charsetForEncoding(c->name(), true ));
- //kdDebug(6005) << "charset is " << (int)d->m_settings->charset() << endl;
- }
- d->m_doc->applyChanges(true, true);
- }
-#endif
-
- // begin lines added in lieu of big fixme
- if ( !d->m_decoder ) {
- d->m_decoder = new Decoder();
- if(!d->m_encoding.isNull())
- d->m_decoder->setEncoding(d->m_encoding.latin1(), d->m_haveEncoding);
- else {
- //FIXME: d->m_decoder->setEncoding(settings()->encoding().latin1(), d->m_haveEncoding);
- }
- }
- if ( len == 0 )
- return;
-
- if ( len == -1 )
- len = strlen( str );
-
-#ifdef _KWQ_TIMING
- double start = CFAbsoluteTimeGetCurrent();
-#endif
-
- QString decoded = d->m_decoder->decode(str, len);
- if (decoded.isEmpty()) {
- return;
- }
-
- if (!m_decodingStarted) {
- d->m_doc->determineParseMode(decoded);
- m_decodingStarted = true;
- }
-
-#if FIGURE_OUT_WHAT_APPLY_CHANGES_DOES
- d->m_doc->applyChanges();
-#endif
-
- // end lines added in lieu of big fixme
-
- if (part->jScript())
- part->jScript()->appendSourceFile(part->m_url.url(),decoded);
- Tokenizer* t = d->m_doc->tokenizer();
- if(t)
- t->write( decoded, true );
-
-#ifdef _KWQ_TIMING
- double thisTime = CFAbsoluteTimeGetCurrent() - start;
- d->totalWriteTime += thisTime;
- KWQDEBUGLEVEL (0x200, "%s bytes = %d, seconds = %f, total = %f\n", part->m_url.url().latin1(), len, thisTime, d->totalWriteTime);
-#endif
-}
-
-// FIXME: Need to remerge this with code in khtml_part.cpp?
void KWQKHTMLPartImpl::end()
{
KWQ_ASSERT(d->m_doc != NULL);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 012cb95..eb427b1 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -118,7 +118,6 @@ private:
int m_redirectionTimer;
KURL m_baseURL;
- bool m_decodingStarted;
friend class KHTMLPart;
};
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 68813fa..b29561e 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -92,8 +92,6 @@ void KWQKHTMLPartImpl::openURL(const KURL &url)
{
d->m_workingURL = url;
part->m_url = url;
-
- m_decodingStarted = false;
}
void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int length, bool complete)
@@ -204,81 +202,6 @@ void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
}
// FIXME: Need to remerge this with code in khtml_part.cpp?
-void KWQKHTMLPartImpl::write( const char *str, int len )
-{
- /* FIXME: hook this code back when we have decoders completely working */
-#if 0
- if(d->m_bFirstData) {
- // determine the parse mode
- d->m_doc->determineParseMode( decoded );
- d->m_bFirstData = false;
-
- //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
- // ### this is still quite hacky, but should work a lot better than the old solution
- if(d->m_decoder->visuallyOrdered()) d->m_doc->setVisuallyOrdered();
-
- if (!d->m_haveCharset)
- {
- const QTextCodec *c = d->m_decoder->codec();
- //kdDebug(6005) << "setting up charset to " << (int) KGlobal::charsets()->charsetForEncoding(c->name()) << endl;
- d->m_charset = KGlobal::charsets()->charsetForEncoding(c->name());
- d->m_settings->setCharset( d->m_charset );
- d->m_settings->setScript( KGlobal::charsets()->charsetForEncoding(c->name(), true ));
- //kdDebug(6005) << "charset is " << (int)d->m_settings->charset() << endl;
- }
- d->m_doc->applyChanges(true, true);
- }
-#endif
-
- // begin lines added in lieu of big fixme
- if ( !d->m_decoder ) {
- d->m_decoder = new Decoder();
- if(!d->m_encoding.isNull())
- d->m_decoder->setEncoding(d->m_encoding.latin1(), d->m_haveEncoding);
- else {
- //FIXME: d->m_decoder->setEncoding(settings()->encoding().latin1(), d->m_haveEncoding);
- }
- }
- if ( len == 0 )
- return;
-
- if ( len == -1 )
- len = strlen( str );
-
-#ifdef _KWQ_TIMING
- double start = CFAbsoluteTimeGetCurrent();
-#endif
-
- QString decoded = d->m_decoder->decode(str, len);
- if (decoded.isEmpty()) {
- return;
- }
-
- if (!m_decodingStarted) {
- d->m_doc->determineParseMode(decoded);
- m_decodingStarted = true;
- }
-
-#if FIGURE_OUT_WHAT_APPLY_CHANGES_DOES
- d->m_doc->applyChanges();
-#endif
-
- // end lines added in lieu of big fixme
-
- if (part->jScript())
- part->jScript()->appendSourceFile(part->m_url.url(),decoded);
- Tokenizer* t = d->m_doc->tokenizer();
- if(t)
- t->write( decoded, true );
-
-#ifdef _KWQ_TIMING
- double thisTime = CFAbsoluteTimeGetCurrent() - start;
- d->totalWriteTime += thisTime;
- KWQDEBUGLEVEL (0x200, "%s bytes = %d, seconds = %f, total = %f\n", part->m_url.url().latin1(), len, thisTime, d->totalWriteTime);
-#endif
-}
-
-// FIXME: Need to remerge this with code in khtml_part.cpp?
void KWQKHTMLPartImpl::end()
{
KWQ_ASSERT(d->m_doc != NULL);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list