[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:50:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9958a3aed4a43c59ee187f2829cdd7f8df09a4fd
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 10 22:00:18 2001 +0000
Added some comments to openURL.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@307 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 843ee4e..0b0154b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -44,10 +44,13 @@ class KHTMLPartPrivate
public:
DOM::DocumentImpl *m_doc;
khtml::Decoder *m_decoder;
+
QString m_encoding;
QFont::CharSet m_charset;
KHTMLSettings *m_settings;
+ KURL m_workingURL;
+
bool m_bFirstData:1;
bool m_haveEncoding:1;
bool m_haveCharset:1;
@@ -90,12 +93,40 @@ KHTMLPart::~KHTMLPart()
bool KHTMLPart::openURL( const KURL &url )
{
- _logNotYetImplemented();
+ // Close the previous URL.
+ closeURL();
+
+ //if ( args.doPost() && (url.protocol().startsWith("http")) )
+ //{
+ // d->m_job = KIO::http_post( url, args.postData, false );
+ // d->m_job->addMetaData("content-type", args.contentType() );
+ //}
+ //else
+ // d->m_job = KIO::get( url, args.reload, false );
+
+ //connect( d->m_job, SIGNAL( result( KIO::Job * ) ),
+ // SLOT( slotFinished( KIO::Job * ) ) );
+ //connect( d->m_job, SIGNAL( data( KIO::Job*, const QByteArray &)),
+ // SLOT( slotData( KIO::Job*, const QByteArray &)));
+ //connect( d->m_job, SIGNAL(redirection(KIO::Job*, const KURL&) ),
+ // SLOT( slotRedirection(KIO::Job*,const KURL&) ) );
+
+ // Initiate request for URL data.
+
+ // Setup callbacks for incoming data.
+
+ // Keep a reference to the current working URL.
+ d->m_workingURL = url;
+
+ return true;
}
bool KHTMLPart::closeURL()
{
- _logNotYetImplemented();
+ // Cancel any pending loads.
+
+ // Reset the the current working URL to the default URL.
+ d->m_workingURL = KURL();
}
@@ -242,7 +273,7 @@ void KHTMLPart::write( const char *str, int len)
d->m_doc->determineParseMode( decoded );
d->m_bFirstData = false;
- //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
+ //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();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 843ee4e..0b0154b 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -44,10 +44,13 @@ class KHTMLPartPrivate
public:
DOM::DocumentImpl *m_doc;
khtml::Decoder *m_decoder;
+
QString m_encoding;
QFont::CharSet m_charset;
KHTMLSettings *m_settings;
+ KURL m_workingURL;
+
bool m_bFirstData:1;
bool m_haveEncoding:1;
bool m_haveCharset:1;
@@ -90,12 +93,40 @@ KHTMLPart::~KHTMLPart()
bool KHTMLPart::openURL( const KURL &url )
{
- _logNotYetImplemented();
+ // Close the previous URL.
+ closeURL();
+
+ //if ( args.doPost() && (url.protocol().startsWith("http")) )
+ //{
+ // d->m_job = KIO::http_post( url, args.postData, false );
+ // d->m_job->addMetaData("content-type", args.contentType() );
+ //}
+ //else
+ // d->m_job = KIO::get( url, args.reload, false );
+
+ //connect( d->m_job, SIGNAL( result( KIO::Job * ) ),
+ // SLOT( slotFinished( KIO::Job * ) ) );
+ //connect( d->m_job, SIGNAL( data( KIO::Job*, const QByteArray &)),
+ // SLOT( slotData( KIO::Job*, const QByteArray &)));
+ //connect( d->m_job, SIGNAL(redirection(KIO::Job*, const KURL&) ),
+ // SLOT( slotRedirection(KIO::Job*,const KURL&) ) );
+
+ // Initiate request for URL data.
+
+ // Setup callbacks for incoming data.
+
+ // Keep a reference to the current working URL.
+ d->m_workingURL = url;
+
+ return true;
}
bool KHTMLPart::closeURL()
{
- _logNotYetImplemented();
+ // Cancel any pending loads.
+
+ // Reset the the current working URL to the default URL.
+ d->m_workingURL = KURL();
}
@@ -242,7 +273,7 @@ void KHTMLPart::write( const char *str, int len)
d->m_doc->determineParseMode( decoded );
d->m_bFirstData = false;
- //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
+ //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();
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 843ee4e..0b0154b 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -44,10 +44,13 @@ class KHTMLPartPrivate
public:
DOM::DocumentImpl *m_doc;
khtml::Decoder *m_decoder;
+
QString m_encoding;
QFont::CharSet m_charset;
KHTMLSettings *m_settings;
+ KURL m_workingURL;
+
bool m_bFirstData:1;
bool m_haveEncoding:1;
bool m_haveCharset:1;
@@ -90,12 +93,40 @@ KHTMLPart::~KHTMLPart()
bool KHTMLPart::openURL( const KURL &url )
{
- _logNotYetImplemented();
+ // Close the previous URL.
+ closeURL();
+
+ //if ( args.doPost() && (url.protocol().startsWith("http")) )
+ //{
+ // d->m_job = KIO::http_post( url, args.postData, false );
+ // d->m_job->addMetaData("content-type", args.contentType() );
+ //}
+ //else
+ // d->m_job = KIO::get( url, args.reload, false );
+
+ //connect( d->m_job, SIGNAL( result( KIO::Job * ) ),
+ // SLOT( slotFinished( KIO::Job * ) ) );
+ //connect( d->m_job, SIGNAL( data( KIO::Job*, const QByteArray &)),
+ // SLOT( slotData( KIO::Job*, const QByteArray &)));
+ //connect( d->m_job, SIGNAL(redirection(KIO::Job*, const KURL&) ),
+ // SLOT( slotRedirection(KIO::Job*,const KURL&) ) );
+
+ // Initiate request for URL data.
+
+ // Setup callbacks for incoming data.
+
+ // Keep a reference to the current working URL.
+ d->m_workingURL = url;
+
+ return true;
}
bool KHTMLPart::closeURL()
{
- _logNotYetImplemented();
+ // Cancel any pending loads.
+
+ // Reset the the current working URL to the default URL.
+ d->m_workingURL = KURL();
}
@@ -242,7 +273,7 @@ void KHTMLPart::write( const char *str, int len)
d->m_doc->determineParseMode( decoded );
d->m_bFirstData = false;
- //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
+ //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();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list