[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:51:17 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f0158106b3cf0fcf3d03116719517afd02b9e756
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 1 00:43:29 2001 +0000
Some small code cleanups, and removal of some unneeded debugging messages
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@394 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 6e01c7c..7b9b9f2 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -417,8 +417,6 @@ void KHTMLPart::write( const char *str, int len)
Tokenizer* t = d->m_doc->tokenizer();
if(t)
t->write( decoded, true );
-
- NSLog(@"!!! write complete");
}
@@ -668,7 +666,7 @@ KURL KHTMLPart::completeURL( const QString &url, const QString &target = QString
const KURL & KHTMLPart::url() const
{
- _logNotYetImplemented();
+ return d->m_workingURL;
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 6e01c7c..7b9b9f2 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -417,8 +417,6 @@ void KHTMLPart::write( const char *str, int len)
Tokenizer* t = d->m_doc->tokenizer();
if(t)
t->write( decoded, true );
-
- NSLog(@"!!! write complete");
}
@@ -668,7 +666,7 @@ KURL KHTMLPart::completeURL( const QString &url, const QString &target = QString
const KURL & KHTMLPart::url() const
{
- _logNotYetImplemented();
+ return d->m_workingURL;
}
diff --git a/WebCore/kwq/KWQKHistoryProvider.mm b/WebCore/kwq/KWQKHistoryProvider.mm
index e2d05dc..a58c38e 100644
--- a/WebCore/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/kwq/KWQKHistoryProvider.mm
@@ -33,8 +33,7 @@ static HistoryProvider *instance = 0;
HistoryProvider *HistoryProvider::self()
{
- _logNotYetImplemented();
- if (instance == 0) {
+ if (instance == 0) {
instance = new HistoryProvider();
}
return instance;
@@ -43,19 +42,17 @@ HistoryProvider *HistoryProvider::self()
HistoryProvider::HistoryProvider()
{
- _logNotYetImplemented();
}
HistoryProvider::~HistoryProvider()
{
- _logNotYetImplemented();
}
-bool HistoryProvider::contains(const QString &) const
+bool HistoryProvider::contains(const QString &s) const
{
- _logNotYetImplemented();
+ // FIXME: implement real history
return FALSE;
}
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 685e256..0165b3a 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1218,13 +1218,8 @@ void Cache::clear()
CachedImage *Cache::requestImage( const DocLoader* dl, const DOMString & url, const DOMString &baseUrl, bool reload, int _expireDate )
{
-
- fprintf(stderr, "!!! Cache::requestImage: url = %s\n", url.string().latin1());
- fprintf(stderr, "!!! Cache::requestImage: baseUrl = %s\n", baseUrl.string().latin1());
-
// this brings the _url to a standard form...
KURL kurl = completeURL( url, baseUrl );
- fprintf(stderr, "!!! Cache::requestImage: complete url = %s\n", kurl.url().latin1());
if( kurl.isMalformed() )
{
#ifdef CACHE_DEBUG
@@ -1242,7 +1237,6 @@ CachedImage *Cache::requestImage( const DocLoader* dl, const DOMString & url, co
kdDebug( 6060 ) << "Cache: new: " << kurl.url() << endl;
#endif
CachedImage *im = new CachedImage(kurl.url(), baseUrl, reload, _expireDate);
- fprintf(stderr, "!!! Cache::requestImage: im->baseURL() = %s\n", im->baseURL().string().latin1());
if ( dl && dl->autoloadImages() ) Cache::loader()->load(im, im->baseURL(), true);
cache->insert( kurl.url(), im );
lru->append( kurl.url() );
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 685e256..0165b3a 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1218,13 +1218,8 @@ void Cache::clear()
CachedImage *Cache::requestImage( const DocLoader* dl, const DOMString & url, const DOMString &baseUrl, bool reload, int _expireDate )
{
-
- fprintf(stderr, "!!! Cache::requestImage: url = %s\n", url.string().latin1());
- fprintf(stderr, "!!! Cache::requestImage: baseUrl = %s\n", baseUrl.string().latin1());
-
// this brings the _url to a standard form...
KURL kurl = completeURL( url, baseUrl );
- fprintf(stderr, "!!! Cache::requestImage: complete url = %s\n", kurl.url().latin1());
if( kurl.isMalformed() )
{
#ifdef CACHE_DEBUG
@@ -1242,7 +1237,6 @@ CachedImage *Cache::requestImage( const DocLoader* dl, const DOMString & url, co
kdDebug( 6060 ) << "Cache: new: " << kurl.url() << endl;
#endif
CachedImage *im = new CachedImage(kurl.url(), baseUrl, reload, _expireDate);
- fprintf(stderr, "!!! Cache::requestImage: im->baseURL() = %s\n", im->baseURL().string().latin1());
if ( dl && dl->autoloadImages() ) Cache::loader()->load(im, im->baseURL(), true);
cache->insert( kurl.url(), im );
lru->append( kurl.url() );
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 685e256..0165b3a 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1218,13 +1218,8 @@ void Cache::clear()
CachedImage *Cache::requestImage( const DocLoader* dl, const DOMString & url, const DOMString &baseUrl, bool reload, int _expireDate )
{
-
- fprintf(stderr, "!!! Cache::requestImage: url = %s\n", url.string().latin1());
- fprintf(stderr, "!!! Cache::requestImage: baseUrl = %s\n", baseUrl.string().latin1());
-
// this brings the _url to a standard form...
KURL kurl = completeURL( url, baseUrl );
- fprintf(stderr, "!!! Cache::requestImage: complete url = %s\n", kurl.url().latin1());
if( kurl.isMalformed() )
{
#ifdef CACHE_DEBUG
@@ -1242,7 +1237,6 @@ CachedImage *Cache::requestImage( const DocLoader* dl, const DOMString & url, co
kdDebug( 6060 ) << "Cache: new: " << kurl.url() << endl;
#endif
CachedImage *im = new CachedImage(kurl.url(), baseUrl, reload, _expireDate);
- fprintf(stderr, "!!! Cache::requestImage: im->baseURL() = %s\n", im->baseURL().string().latin1());
if ( dl && dl->autoloadImages() ) Cache::loader()->load(im, im->baseURL(), true);
cache->insert( kurl.url(), im );
lru->append( kurl.url() );
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 6e01c7c..7b9b9f2 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -417,8 +417,6 @@ void KHTMLPart::write( const char *str, int len)
Tokenizer* t = d->m_doc->tokenizer();
if(t)
t->write( decoded, true );
-
- NSLog(@"!!! write complete");
}
@@ -668,7 +666,7 @@ KURL KHTMLPart::completeURL( const QString &url, const QString &target = QString
const KURL & KHTMLPart::url() const
{
- _logNotYetImplemented();
+ return d->m_workingURL;
}
diff --git a/WebCore/src/kwq/KWQKHistoryProvider.mm b/WebCore/src/kwq/KWQKHistoryProvider.mm
index e2d05dc..a58c38e 100644
--- a/WebCore/src/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/src/kwq/KWQKHistoryProvider.mm
@@ -33,8 +33,7 @@ static HistoryProvider *instance = 0;
HistoryProvider *HistoryProvider::self()
{
- _logNotYetImplemented();
- if (instance == 0) {
+ if (instance == 0) {
instance = new HistoryProvider();
}
return instance;
@@ -43,19 +42,17 @@ HistoryProvider *HistoryProvider::self()
HistoryProvider::HistoryProvider()
{
- _logNotYetImplemented();
}
HistoryProvider::~HistoryProvider()
{
- _logNotYetImplemented();
}
-bool HistoryProvider::contains(const QString &) const
+bool HistoryProvider::contains(const QString &s) const
{
- _logNotYetImplemented();
+ // FIXME: implement real history
return FALSE;
}
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 685e256..0165b3a 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1218,13 +1218,8 @@ void Cache::clear()
CachedImage *Cache::requestImage( const DocLoader* dl, const DOMString & url, const DOMString &baseUrl, bool reload, int _expireDate )
{
-
- fprintf(stderr, "!!! Cache::requestImage: url = %s\n", url.string().latin1());
- fprintf(stderr, "!!! Cache::requestImage: baseUrl = %s\n", baseUrl.string().latin1());
-
// this brings the _url to a standard form...
KURL kurl = completeURL( url, baseUrl );
- fprintf(stderr, "!!! Cache::requestImage: complete url = %s\n", kurl.url().latin1());
if( kurl.isMalformed() )
{
#ifdef CACHE_DEBUG
@@ -1242,7 +1237,6 @@ CachedImage *Cache::requestImage( const DocLoader* dl, const DOMString & url, co
kdDebug( 6060 ) << "Cache: new: " << kurl.url() << endl;
#endif
CachedImage *im = new CachedImage(kurl.url(), baseUrl, reload, _expireDate);
- fprintf(stderr, "!!! Cache::requestImage: im->baseURL() = %s\n", im->baseURL().string().latin1());
if ( dl && dl->autoloadImages() ) Cache::loader()->load(im, im->baseURL(), true);
cache->insert( kurl.url(), im );
lru->append( kurl.url() );
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list