[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:20:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3c1d88b1c731f4ab6265bb8f427c2b4f78073687
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jun 17 23:48:46 2002 +0000
Fixed a storage leak.
* kwq/WebCoreBridge.mm: (-[WebCoreBridge documentTextFromDOM]): Add a missing autorelease.
Remove a bunch of loader-related APPLE_CHANGES.
* khtml/misc/loader.h: Remove KWQURLLoadClient and KWQLoaderImpl.
* khtml/misc/loader.cpp:
(Loader::Loader): Remove unneeded KWQLoaderImpl object.
(Loader::~Loader): Remove unneeded KWQLoaderImpl object.
(Loader::servePendingRequests): Call KWQServeRequest instead of KWQLoaderImpl::serveRequest.
(Loader::slotFinished): Remove unneeded KWQLoaderImpl::objectFinished.
* kwq/KWQLoaderImpl.h:
* kwq/KWQKloader.mm: (KWQServeRequest): Replaces the KWQLoaderImpl class. The rest of what
was in this class was obsolete.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1394 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4579ef0..a7409bf 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-06-17 Darin Adler <darin at apple.com>
+
+ Fixed a storage leak.
+
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge documentTextFromDOM]): Add a missing autorelease.
+
+ Remove a bunch of loader-related APPLE_CHANGES.
+
+ * khtml/misc/loader.h: Remove KWQURLLoadClient and KWQLoaderImpl.
+ * khtml/misc/loader.cpp:
+ (Loader::Loader): Remove unneeded KWQLoaderImpl object.
+ (Loader::~Loader): Remove unneeded KWQLoaderImpl object.
+ (Loader::servePendingRequests): Call KWQServeRequest instead of KWQLoaderImpl::serveRequest.
+ (Loader::slotFinished): Remove unneeded KWQLoaderImpl::objectFinished.
+
+ * kwq/KWQLoaderImpl.h:
+ * kwq/KWQKloader.mm: (KWQServeRequest): Replaces the KWQLoaderImpl class. The rest of what
+ was in this class was obsolete.
+
2002-06-17 Richard Williamson <rjw at apple.com>
Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4579ef0..a7409bf 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2002-06-17 Darin Adler <darin at apple.com>
+
+ Fixed a storage leak.
+
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge documentTextFromDOM]): Add a missing autorelease.
+
+ Remove a bunch of loader-related APPLE_CHANGES.
+
+ * khtml/misc/loader.h: Remove KWQURLLoadClient and KWQLoaderImpl.
+ * khtml/misc/loader.cpp:
+ (Loader::Loader): Remove unneeded KWQLoaderImpl object.
+ (Loader::~Loader): Remove unneeded KWQLoaderImpl object.
+ (Loader::servePendingRequests): Call KWQServeRequest instead of KWQLoaderImpl::serveRequest.
+ (Loader::slotFinished): Remove unneeded KWQLoaderImpl::objectFinished.
+
+ * kwq/KWQLoaderImpl.h:
+ * kwq/KWQKloader.mm: (KWQServeRequest): Replaces the KWQLoaderImpl class. The rest of what
+ was in this class was obsolete.
+
2002-06-17 Richard Williamson <rjw at apple.com>
Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4579ef0..a7409bf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2002-06-17 Darin Adler <darin at apple.com>
+
+ Fixed a storage leak.
+
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge documentTextFromDOM]): Add a missing autorelease.
+
+ Remove a bunch of loader-related APPLE_CHANGES.
+
+ * khtml/misc/loader.h: Remove KWQURLLoadClient and KWQLoaderImpl.
+ * khtml/misc/loader.cpp:
+ (Loader::Loader): Remove unneeded KWQLoaderImpl object.
+ (Loader::~Loader): Remove unneeded KWQLoaderImpl object.
+ (Loader::servePendingRequests): Call KWQServeRequest instead of KWQLoaderImpl::serveRequest.
+ (Loader::slotFinished): Remove unneeded KWQLoaderImpl::objectFinished.
+
+ * kwq/KWQLoaderImpl.h:
+ * kwq/KWQKloader.mm: (KWQServeRequest): Replaces the KWQLoaderImpl class. The rest of what
+ was in this class was obsolete.
+
2002-06-17 Richard Williamson <rjw at apple.com>
Fixed www.2cpu.com regression. QWidget::_displayRect was displaying the wrong
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index f3d3fbc..2bcae7a 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -1061,16 +1061,10 @@ Loader::Loader() : QObject()
{
m_requestsPending.setAutoDelete( true );
m_requestsLoading.setAutoDelete( true );
-#ifdef APPLE_CHANGES
- d = new KWQLoaderImpl(this);
-#endif
}
Loader::~Loader()
{
-#ifdef APPLE_CHANGES
- delete d;
-#endif
}
void Loader::load(DocLoader* dl, CachedObject *object, bool incremental)
@@ -1101,7 +1095,7 @@ void Loader::servePendingRequests()
KIO::TransferJob* job = KIO::get( u, false, false /*no GUI*/);
#ifdef APPLE_CHANGES
- d->serveRequest(req, job);
+ KWQServeRequest(this, req, job);
#else
job->addMetaData("cache", getCacheControlString(req->object->cachePolicy()));
if (!req->object->accept().isEmpty())
@@ -1155,9 +1149,6 @@ kdDebug(6060) << "Loader::slotFinished, url = " << j->url().url() << " expires "
r->object->setExpireDate(expireDate, false);
}
-#ifdef APPLE_CHANGES
- d->objectFinished(r->object);
-#endif
r->object->finish();
#ifdef CACHE_DEBUG
diff --git a/WebCore/khtml/misc/loader.h b/WebCore/khtml/misc/loader.h
index 64b8cd1..3012c00 100644
--- a/WebCore/khtml/misc/loader.h
+++ b/WebCore/khtml/misc/loader.h
@@ -66,15 +66,6 @@ namespace DOM
class DocumentImpl;
};
-#ifdef APPLE_CHANGES
-class KWQLoaderImpl;
-#ifdef __OBJC__
- at class KWQURLLoadClient;
-#else
-class KWQURLLoadClient;
-#endif
-#endif
-
namespace khtml
{
class CachedObject;
@@ -373,9 +364,6 @@ namespace khtml
QBuffer m_buffer;
CachedObject *object;
DocLoader* m_docLoader;
-#ifdef APPLE_CHANGES
- KWQURLLoadClient *client;
-#endif
};
/**
@@ -420,9 +408,6 @@ namespace khtml
#ifdef HAVE_LIBJPEG
KJPEGFormatType m_jpegloader;
#endif
-#ifdef APPLE_CHANGES
- KWQLoaderImpl *d;
-#endif
};
/**
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index b2bd547..b7522a9 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -35,23 +35,23 @@
#import <kwqdebug.h>
-using khtml::DocLoader;
using khtml::Loader;
using khtml::Request;
+using KIO::TransferJob;
@interface WebCoreResourceLoader : NSObject <WebCoreResourceLoader>
{
- khtml::Loader *loader;
- KIO::TransferJob *job;
+ Loader *loader;
+ TransferJob *job;
}
--(id)initWithLoader:(khtml::Loader *)loader job:(KIO::TransferJob *)job;
+-(id)initWithLoader:(Loader *)loader job:(TransferJob *)job;
@end
@implementation WebCoreResourceLoader
--(id)initWithLoader:(khtml::Loader *)l job:(KIO::TransferJob *)j;
+-(id)initWithLoader:(Loader *)l job:(TransferJob *)j;
{
[super init];
@@ -86,35 +86,16 @@ using khtml::Request;
@end
-KWQLoaderImpl::KWQLoaderImpl(Loader *l)
- : loader(l)
+void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
{
-}
-
-void KWQLoaderImpl::serveRequest(Request *req, KIO::TransferJob *job)
-{
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "Serving request for base %s, url %s",
- req->m_docLoader->part()->baseURL().url().latin1(), req->object->url().string().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "Serving request for base %s, url %s",
+ request->m_docLoader->part()->baseURL().url().latin1(),
+ request->object->url().string().latin1());
WebCoreResourceLoader *resourceLoader = [[WebCoreResourceLoader alloc] initWithLoader:loader job:job];
- WebCoreBridge *bridge = ((KHTMLPart *)req->m_docLoader->part())->impl->getBridge();
+ WebCoreBridge *bridge = ((KHTMLPart *)request->m_docLoader->part())->impl->getBridge();
job->setHandle([bridge startLoadingResource:resourceLoader withURL:job->url()]);
[resourceLoader release];
}
-
-void KWQLoaderImpl::objectFinished(khtml::CachedObject *object)
-{
- NSString *urlString;
-
- urlString = [NSString stringWithCString:object->url().string().latin1()];
- if ([urlString hasSuffix:@"/"]) {
- urlString = [urlString substringToIndex:([urlString length] - 1)];
- }
-
- // FIXME: Are we sure that we can globally notify with the URL as the notification
- // name without conflicting with other frameworks? No "IF" prefix needed?
- // Perhaps the notification should have a distinctive name, and the URL should be the object.
- [[NSNotificationCenter defaultCenter] postNotificationName:urlString object:nil];
-}
diff --git a/WebCore/kwq/KWQLoader.h b/WebCore/kwq/KWQLoader.h
index 0df8ff1..d57e2e9 100644
--- a/WebCore/kwq/KWQLoader.h
+++ b/WebCore/kwq/KWQLoader.h
@@ -24,7 +24,6 @@
*/
namespace khtml {
- class CachedObject;
class Loader;
class Request;
}
@@ -33,17 +32,4 @@ namespace KIO {
class TransferJob;
}
-class KWQLoaderImpl
-{
-public:
- KWQLoaderImpl(khtml::Loader *);
-
- void serveRequest(khtml::Request *, KIO::TransferJob *);
- void objectFinished(khtml::CachedObject *);
-
-private:
- KWQLoaderImpl(const KWQLoaderImpl&);
- KWQLoaderImpl& operator=(const KWQLoaderImpl&);
-
- khtml::Loader *loader;
-};
+void KWQServeRequest(khtml::Loader *, khtml::Request *, KIO::TransferJob *);
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index b2bd547..b7522a9 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -35,23 +35,23 @@
#import <kwqdebug.h>
-using khtml::DocLoader;
using khtml::Loader;
using khtml::Request;
+using KIO::TransferJob;
@interface WebCoreResourceLoader : NSObject <WebCoreResourceLoader>
{
- khtml::Loader *loader;
- KIO::TransferJob *job;
+ Loader *loader;
+ TransferJob *job;
}
--(id)initWithLoader:(khtml::Loader *)loader job:(KIO::TransferJob *)job;
+-(id)initWithLoader:(Loader *)loader job:(TransferJob *)job;
@end
@implementation WebCoreResourceLoader
--(id)initWithLoader:(khtml::Loader *)l job:(KIO::TransferJob *)j;
+-(id)initWithLoader:(Loader *)l job:(TransferJob *)j;
{
[super init];
@@ -86,35 +86,16 @@ using khtml::Request;
@end
-KWQLoaderImpl::KWQLoaderImpl(Loader *l)
- : loader(l)
+void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
{
-}
-
-void KWQLoaderImpl::serveRequest(Request *req, KIO::TransferJob *job)
-{
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "Serving request for base %s, url %s",
- req->m_docLoader->part()->baseURL().url().latin1(), req->object->url().string().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "Serving request for base %s, url %s",
+ request->m_docLoader->part()->baseURL().url().latin1(),
+ request->object->url().string().latin1());
WebCoreResourceLoader *resourceLoader = [[WebCoreResourceLoader alloc] initWithLoader:loader job:job];
- WebCoreBridge *bridge = ((KHTMLPart *)req->m_docLoader->part())->impl->getBridge();
+ WebCoreBridge *bridge = ((KHTMLPart *)request->m_docLoader->part())->impl->getBridge();
job->setHandle([bridge startLoadingResource:resourceLoader withURL:job->url()]);
[resourceLoader release];
}
-
-void KWQLoaderImpl::objectFinished(khtml::CachedObject *object)
-{
- NSString *urlString;
-
- urlString = [NSString stringWithCString:object->url().string().latin1()];
- if ([urlString hasSuffix:@"/"]) {
- urlString = [urlString substringToIndex:([urlString length] - 1)];
- }
-
- // FIXME: Are we sure that we can globally notify with the URL as the notification
- // name without conflicting with other frameworks? No "IF" prefix needed?
- // Perhaps the notification should have a distinctive name, and the URL should be the object.
- [[NSNotificationCenter defaultCenter] postNotificationName:urlString object:nil];
-}
diff --git a/WebCore/kwq/KWQLoaderImpl.h b/WebCore/kwq/KWQLoaderImpl.h
index 0df8ff1..d57e2e9 100644
--- a/WebCore/kwq/KWQLoaderImpl.h
+++ b/WebCore/kwq/KWQLoaderImpl.h
@@ -24,7 +24,6 @@
*/
namespace khtml {
- class CachedObject;
class Loader;
class Request;
}
@@ -33,17 +32,4 @@ namespace KIO {
class TransferJob;
}
-class KWQLoaderImpl
-{
-public:
- KWQLoaderImpl(khtml::Loader *);
-
- void serveRequest(khtml::Request *, KIO::TransferJob *);
- void objectFinished(khtml::CachedObject *);
-
-private:
- KWQLoaderImpl(const KWQLoaderImpl&);
- KWQLoaderImpl& operator=(const KWQLoaderImpl&);
-
- khtml::Loader *loader;
-};
+void KWQServeRequest(khtml::Loader *, khtml::Request *, KIO::TransferJob *);
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index b2bd547..b7522a9 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -35,23 +35,23 @@
#import <kwqdebug.h>
-using khtml::DocLoader;
using khtml::Loader;
using khtml::Request;
+using KIO::TransferJob;
@interface WebCoreResourceLoader : NSObject <WebCoreResourceLoader>
{
- khtml::Loader *loader;
- KIO::TransferJob *job;
+ Loader *loader;
+ TransferJob *job;
}
--(id)initWithLoader:(khtml::Loader *)loader job:(KIO::TransferJob *)job;
+-(id)initWithLoader:(Loader *)loader job:(TransferJob *)job;
@end
@implementation WebCoreResourceLoader
--(id)initWithLoader:(khtml::Loader *)l job:(KIO::TransferJob *)j;
+-(id)initWithLoader:(Loader *)l job:(TransferJob *)j;
{
[super init];
@@ -86,35 +86,16 @@ using khtml::Request;
@end
-KWQLoaderImpl::KWQLoaderImpl(Loader *l)
- : loader(l)
+void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
{
-}
-
-void KWQLoaderImpl::serveRequest(Request *req, KIO::TransferJob *job)
-{
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "Serving request for base %s, url %s",
- req->m_docLoader->part()->baseURL().url().latin1(), req->object->url().string().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "Serving request for base %s, url %s",
+ request->m_docLoader->part()->baseURL().url().latin1(),
+ request->object->url().string().latin1());
WebCoreResourceLoader *resourceLoader = [[WebCoreResourceLoader alloc] initWithLoader:loader job:job];
- WebCoreBridge *bridge = ((KHTMLPart *)req->m_docLoader->part())->impl->getBridge();
+ WebCoreBridge *bridge = ((KHTMLPart *)request->m_docLoader->part())->impl->getBridge();
job->setHandle([bridge startLoadingResource:resourceLoader withURL:job->url()]);
[resourceLoader release];
}
-
-void KWQLoaderImpl::objectFinished(khtml::CachedObject *object)
-{
- NSString *urlString;
-
- urlString = [NSString stringWithCString:object->url().string().latin1()];
- if ([urlString hasSuffix:@"/"]) {
- urlString = [urlString substringToIndex:([urlString length] - 1)];
- }
-
- // FIXME: Are we sure that we can globally notify with the URL as the notification
- // name without conflicting with other frameworks? No "IF" prefix needed?
- // Perhaps the notification should have a distinctive name, and the URL should be the object.
- [[NSNotificationCenter defaultCenter] postNotificationName:urlString object:nil];
-}
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 22beb80..d4243b3 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -102,7 +102,7 @@
if (part) {
DOM::DocumentImpl *doc = part->xmlDocImpl();
if (doc) {
- string = [doc->recursive_toHTML(1).getNSString() copy];
+ string = [[doc->recursive_toHTML(1).getNSString() copy] autorelease];
}
}
if (string == nil) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list