[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:30:51 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0ce971240e4b4cddc52c2d2c40803315b44c329b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 12 22:15:19 2002 +0000
WebCore:
At Ken's urging, fixed the loader cache to be more efficient.
Gives 1% on the cvs-base test.
* force-clean-timestamp: This requires a full rebuild.
* khtml/misc/loader.h:
* khtml/misc/loader.cpp:
(CachedObject::~CachedObject): No longer inline, which is fine since
it was a virtual function anyway. Remove from the LRU list.
(CachedObject::setRequest): Add to the LRU list if it qualifies now.
(CachedObject::ref): Remove from the LRU list.
(CachedObject::deref): Add to the LRU list if it qualifies now.
(CachedCSSStyleSheet::ref): Call CachedObject::ref.
(CachedCSSStyleSheet::deref): Call CachedObject::deref.
(CachedScript::ref): Call CachedObject::ref.
(CachedScript::deref): Call CachedObject::deref.
(CachedImage::ref): Call CachedObject::ref.
(CachedImage::deref): Call CachedObject::deref.
(Cache::init): No "LRU list" to create.
(Cache::clear): No "LRU list" to delete.
(Cache::requestImage): Call moveToHeadOfLRUList.
(Cache::requestStyleSheet): Call moveToHeadOfLRUList.
(Cache::requestScript): Call moveToHeadOfLRUList.
(Cache::flush): New algorithm.
(Cache::removeCacheEntry): Call removeFromLRUList.
(Cache::removeFromLRUList): Added.
(Cache::moveToHeadOfLRUList): Added.
(Cache::insertInLRUList): Added.
* kwq/KWQLoaderImpl.mm: (KWQCheckIfReloading):
* kwq/WebCoreBridge.h:
Change dataSourceIsReloading to isReloading.
WebKit:
* WebCoreSupport.subproj/WebBridge.m: (-[WebBridge isReloading]):
Change dataSourceIsReloading to isReloading.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1801 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ac0da17..6fc40ee 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,38 @@
+2002-08-12 Darin Adler <darin at apple.com>
+
+ At Ken's urging, fixed the loader cache to be more efficient.
+ Gives 1% on the cvs-base test.
+
+ * force-clean-timestamp: This requires a full rebuild.
+
+ * khtml/misc/loader.h:
+ * khtml/misc/loader.cpp:
+ (CachedObject::~CachedObject): No longer inline, which is fine since
+ it was a virtual function anyway. Remove from the LRU list.
+ (CachedObject::setRequest): Add to the LRU list if it qualifies now.
+ (CachedObject::ref): Remove from the LRU list.
+ (CachedObject::deref): Add to the LRU list if it qualifies now.
+ (CachedCSSStyleSheet::ref): Call CachedObject::ref.
+ (CachedCSSStyleSheet::deref): Call CachedObject::deref.
+ (CachedScript::ref): Call CachedObject::ref.
+ (CachedScript::deref): Call CachedObject::deref.
+ (CachedImage::ref): Call CachedObject::ref.
+ (CachedImage::deref): Call CachedObject::deref.
+ (Cache::init): No "LRU list" to create.
+ (Cache::clear): No "LRU list" to delete.
+ (Cache::requestImage): Call moveToHeadOfLRUList.
+ (Cache::requestStyleSheet): Call moveToHeadOfLRUList.
+ (Cache::requestScript): Call moveToHeadOfLRUList.
+ (Cache::flush): New algorithm.
+ (Cache::removeCacheEntry): Call removeFromLRUList.
+ (Cache::removeFromLRUList): Added.
+ (Cache::moveToHeadOfLRUList): Added.
+ (Cache::insertInLRUList): Added.
+
+ * kwq/KWQLoaderImpl.mm: (KWQCheckIfReloading):
+ * kwq/WebCoreBridge.h:
+ Change dataSourceIsReloading to isReloading.
+
2002-08-12 David Hyatt <hyatt at apple.com>
Fix for the crash (assert) at mlb.com (3014322). recalcStyle was
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ac0da17..6fc40ee 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,38 @@
+2002-08-12 Darin Adler <darin at apple.com>
+
+ At Ken's urging, fixed the loader cache to be more efficient.
+ Gives 1% on the cvs-base test.
+
+ * force-clean-timestamp: This requires a full rebuild.
+
+ * khtml/misc/loader.h:
+ * khtml/misc/loader.cpp:
+ (CachedObject::~CachedObject): No longer inline, which is fine since
+ it was a virtual function anyway. Remove from the LRU list.
+ (CachedObject::setRequest): Add to the LRU list if it qualifies now.
+ (CachedObject::ref): Remove from the LRU list.
+ (CachedObject::deref): Add to the LRU list if it qualifies now.
+ (CachedCSSStyleSheet::ref): Call CachedObject::ref.
+ (CachedCSSStyleSheet::deref): Call CachedObject::deref.
+ (CachedScript::ref): Call CachedObject::ref.
+ (CachedScript::deref): Call CachedObject::deref.
+ (CachedImage::ref): Call CachedObject::ref.
+ (CachedImage::deref): Call CachedObject::deref.
+ (Cache::init): No "LRU list" to create.
+ (Cache::clear): No "LRU list" to delete.
+ (Cache::requestImage): Call moveToHeadOfLRUList.
+ (Cache::requestStyleSheet): Call moveToHeadOfLRUList.
+ (Cache::requestScript): Call moveToHeadOfLRUList.
+ (Cache::flush): New algorithm.
+ (Cache::removeCacheEntry): Call removeFromLRUList.
+ (Cache::removeFromLRUList): Added.
+ (Cache::moveToHeadOfLRUList): Added.
+ (Cache::insertInLRUList): Added.
+
+ * kwq/KWQLoaderImpl.mm: (KWQCheckIfReloading):
+ * kwq/WebCoreBridge.h:
+ Change dataSourceIsReloading to isReloading.
+
2002-08-12 David Hyatt <hyatt at apple.com>
Fix for the crash (assert) at mlb.com (3014322). recalcStyle was
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ac0da17..6fc40ee 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,38 @@
+2002-08-12 Darin Adler <darin at apple.com>
+
+ At Ken's urging, fixed the loader cache to be more efficient.
+ Gives 1% on the cvs-base test.
+
+ * force-clean-timestamp: This requires a full rebuild.
+
+ * khtml/misc/loader.h:
+ * khtml/misc/loader.cpp:
+ (CachedObject::~CachedObject): No longer inline, which is fine since
+ it was a virtual function anyway. Remove from the LRU list.
+ (CachedObject::setRequest): Add to the LRU list if it qualifies now.
+ (CachedObject::ref): Remove from the LRU list.
+ (CachedObject::deref): Add to the LRU list if it qualifies now.
+ (CachedCSSStyleSheet::ref): Call CachedObject::ref.
+ (CachedCSSStyleSheet::deref): Call CachedObject::deref.
+ (CachedScript::ref): Call CachedObject::ref.
+ (CachedScript::deref): Call CachedObject::deref.
+ (CachedImage::ref): Call CachedObject::ref.
+ (CachedImage::deref): Call CachedObject::deref.
+ (Cache::init): No "LRU list" to create.
+ (Cache::clear): No "LRU list" to delete.
+ (Cache::requestImage): Call moveToHeadOfLRUList.
+ (Cache::requestStyleSheet): Call moveToHeadOfLRUList.
+ (Cache::requestScript): Call moveToHeadOfLRUList.
+ (Cache::flush): New algorithm.
+ (Cache::removeCacheEntry): Call removeFromLRUList.
+ (Cache::removeFromLRUList): Added.
+ (Cache::moveToHeadOfLRUList): Added.
+ (Cache::insertInLRUList): Added.
+
+ * kwq/KWQLoaderImpl.mm: (KWQCheckIfReloading):
+ * kwq/WebCoreBridge.h:
+ Change dataSourceIsReloading to isReloading.
+
2002-08-12 David Hyatt <hyatt at apple.com>
Fix for the crash (assert) at mlb.com (3014322). recalcStyle was
diff --git a/WebCore/force-clean-timestamp b/WebCore/force-clean-timestamp
index 025bbe8..a298b80 100644
--- a/WebCore/force-clean-timestamp
+++ b/WebCore/force-clean-timestamp
@@ -1 +1 @@
-JavaScriptCore changes 8/12
+loader changes 8/12
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index 6e5fe48..abca575 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -67,6 +67,13 @@ using namespace DOM;
static bool cacheDisabled;
#endif
+CachedObject::~CachedObject()
+{
+ if(m_deleted) abort();
+ Cache::removeFromLRUList(this);
+ m_deleted = true;
+}
+
void CachedObject::finish()
{
if( m_size > MAXCACHEABLE )
@@ -115,6 +122,22 @@ void CachedObject::setRequest(Request *_request)
m_request = _request;
if (canDelete() && m_free)
delete this;
+ else if (allowInLRUList())
+ Cache::insertInLRUList(this);
+}
+
+void CachedObject::ref(CachedObjectClient *c)
+{
+ m_clients.remove(c);
+ m_clients.append(c);
+ Cache::removeFromLRUList(this);
+}
+
+void CachedObject::deref(CachedObjectClient *c)
+{
+ m_clients.remove(c);
+ if (allowInLRUList())
+ Cache::insertInLRUList(this);
}
// -------------------------------------------------------------------------------------------
@@ -151,9 +174,7 @@ CachedCSSStyleSheet::~CachedCSSStyleSheet()
void CachedCSSStyleSheet::ref(CachedObjectClient *c)
{
- // make sure we don't get it twice...
- m_clients.remove(c);
- m_clients.append(c);
+ CachedObject::ref(c);
if(!m_loading) c->setStyleSheet( m_url, m_sheet );
}
@@ -161,7 +182,7 @@ void CachedCSSStyleSheet::ref(CachedObjectClient *c)
void CachedCSSStyleSheet::deref(CachedObjectClient *c)
{
Cache::flush();
- m_clients.remove(c);
+ CachedObject::deref(c);
if ( canDelete() && m_free )
delete this;
}
@@ -233,9 +254,7 @@ CachedScript::~CachedScript()
void CachedScript::ref(CachedObjectClient *c)
{
- // make sure we don't get it twice...
- m_clients.remove(c);
- m_clients.append(c);
+ CachedObject::ref(c);
if(!m_loading) c->notifyFinished(this);
}
@@ -243,7 +262,7 @@ void CachedScript::ref(CachedObjectClient *c)
void CachedScript::deref(CachedObjectClient *c)
{
Cache::flush();
- m_clients.remove(c);
+ CachedObject::deref(c);
if ( canDelete() && m_free )
delete this;
}
@@ -486,9 +505,7 @@ void CachedImage::ref( CachedObjectClient *c )
kdDebug( 6060 ) << this << " CachedImage::ref(" << c << ") " << endl;
#endif
- // make sure we don't get it twice...
- m_clients.remove(c);
- m_clients.append(c);
+ CachedObject::ref(c);
if( m ) {
m->unpause();
@@ -507,7 +524,7 @@ void CachedImage::deref( CachedObjectClient *c )
kdDebug( 6060 ) << this << " CachedImage::deref(" << c << ") " << endl;
#endif
Cache::flush();
- m_clients.remove( c );
+ CachedObject::deref(c);
if(m && m_clients.isEmpty() && m->running())
m->pause();
if ( canDelete() && m_free )
@@ -1293,24 +1310,25 @@ KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
QDict<CachedObject> *Cache::cache = 0;
QPtrList<DocLoader>* Cache::docloader = 0;
-Cache::LRUList *Cache::lru = 0;
Loader *Cache::m_loader = 0;
int Cache::maxSize = DEFCACHESIZE;
int Cache::flushCount = 0;
-int Cache::cacheSize = 0;
QPixmap *Cache::nullPixmap = 0;
QPixmap *Cache::brokenPixmap = 0;
+CachedObject *Cache::m_headOfLRUList = 0;
+CachedObject *Cache::m_tailOfLRUList = 0;
+CachedObject *Cache::m_headOfUncacheableList = 0;
+int Cache::m_totalSizeOfLRUList = 0;
+int Cache::m_countOfLRUAndUncacheableLists;
+
void Cache::init()
{
if ( !cache )
cache = new QDict<CachedObject>(401, true);
- if ( !lru )
- lru = new LRUList;
-
if ( !docloader )
docloader = new QPtrList<DocLoader>;
@@ -1338,7 +1356,6 @@ void Cache::clear()
#endif
cache->setAutoDelete( true );
delete cache; cache = 0;
- delete lru; lru = 0;
delete nullPixmap; nullPixmap = 0;
delete brokenPixmap; brokenPixmap = 0;
delete m_loader; m_loader = 0;
@@ -1389,7 +1406,7 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
else {
#endif
cache->insert( kurl.url(), im );
- lru->prepend( kurl.url() );
+ moveToHeadOfLRUList(im);
#ifdef APPLE_CHANGES
}
#endif
@@ -1413,7 +1430,7 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
kdDebug( 6060 ) << "Cache: using cached: " << kurl.url() << ", status " << o->status() << endl;
#endif
- lru->touch( kurl.url() );
+ moveToHeadOfLRUList(o);
if ( dl ) {
dl->m_docObjects.remove( o );
#ifdef APPLE_CHANGES
@@ -1463,7 +1480,7 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
else {
#endif
cache->insert( kurl.url(), sheet );
- lru->prepend( kurl.url() );
+ moveToHeadOfLRUList(sheet);
#ifdef APPLE_CHANGES
}
#endif
@@ -1487,7 +1504,7 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
kdDebug( 6060 ) << "Cache: using cached: " << kurl.url() << endl;
#endif
- lru->touch( kurl.url() );
+ moveToHeadOfLRUList(o);
if ( dl ) {
dl->m_docObjects.remove( o );
#ifdef APPLE_CHANGES
@@ -1547,7 +1564,7 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
else {
#endif
cache->insert( kurl.url(), script );
- lru->prepend( kurl.url() );
+ moveToHeadOfLRUList(script);
#ifdef APPLE_CHANGES
}
#endif
@@ -1571,7 +1588,7 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
kdDebug( 6060 ) << "Cache: using cached: " << kurl.url() << endl;
#endif
- lru->touch( kurl.url() );
+ moveToHeadOfLRUList(o);
if ( dl ) {
dl->m_docObjects.remove( o );
#ifdef APPLE_CHANGES
@@ -1597,7 +1614,7 @@ void Cache::flush(bool force)
if (force)
flushCount = 0;
// Don't flush for every image.
- if (!lru || (lru->count() < (uint) flushCount))
+ if (m_countOfLRUAndUncacheableLists < flushCount)
return;
init();
@@ -1607,37 +1624,12 @@ void Cache::flush(bool force)
kdDebug( 6060 ) << "Cache: flush()" << endl;
#endif
- int _cacheSize = 0;
-
- for ( QStringList::Iterator it = lru->fromLast(); it != lru->end(); )
- {
- QString url = *it;
- --it; // Update iterator, we might delete the current entry later on.
- CachedObject *o = cache->find( url );
-
-#ifdef APPLE_CHANGES
- if (!o) {
- continue;
- }
-#endif
+ while (m_headOfUncacheableList)
+ removeCacheEntry(m_headOfUncacheableList);
+ while (m_totalSizeOfLRUList > maxSize)
+ removeCacheEntry(m_tailOfLRUList);
- if( !o->canDelete() || o->status() == CachedObject::Persistent ) {
- continue; // image is still used or cached permanently
- // in this case don't count it for the size of the cache.
- }
-
- if( o->status() != CachedObject::Uncacheable )
- {
- _cacheSize += o->size();
-
- if( _cacheSize < maxSize )
- continue;
- }
- removeCacheEntry( o );
- }
- Cache::cacheSize = _cacheSize;
-
- flushCount = lru->count()+10; // Flush again when the cache has grown.
+ flushCount = m_countOfLRUAndUncacheableLists+10; // Flush again when the cache has grown.
#ifdef CACHE_DEBUG
//statistics();
#endif
@@ -1686,7 +1678,7 @@ void Cache::statistics()
kdDebug( 6060 ) << "------------------------- image cache statistics -------------------" << endl;
kdDebug( 6060 ) << "Number of items in cache: " << cache->count() << endl;
- kdDebug( 6060 ) << "Number of items in lru : " << lru->count() << endl;
+ kdDebug( 6060 ) << "Number of items in lru : " << m_countOfLRUAndUncacheableLists << endl;
kdDebug( 6060 ) << "Number of cached images: " << cache->count()-movie << endl;
kdDebug( 6060 ) << "Number of cached movies: " << movie << endl;
kdDebug( 6060 ) << "Number of cached stylesheets: " << stylesheets << endl;
@@ -1704,7 +1696,7 @@ void Cache::removeCacheEntry( CachedObject *object )
object->setFree( true );
cache->remove( key );
- lru->remove( key );
+ removeFromLRUList(object);
const DocLoader* dl;
for ( dl=docloader->first(); dl; dl=docloader->next() )
@@ -1714,6 +1706,61 @@ void Cache::removeCacheEntry( CachedObject *object )
delete object;
}
+void Cache::removeFromLRUList(CachedObject *object)
+{
+ CachedObject *next = object->m_nextInLRUList;
+ CachedObject *prev = object->m_prevInLRUList;
+ bool uncacheable = object->status() == CachedObject::Uncacheable;
+ CachedObject *&head = uncacheable ? m_headOfUncacheableList : m_headOfLRUList;
+
+ if (next == 0 && prev == 0 && head != object) {
+ return;
+ }
+
+ object->m_nextInLRUList = 0;
+ object->m_prevInLRUList = 0;
+
+ if (next)
+ next->m_prevInLRUList = prev;
+ else if (m_tailOfLRUList == object)
+ m_tailOfLRUList = prev;
+
+ if (prev)
+ prev->m_nextInLRUList = next;
+ else if (head == object)
+ head = next;
+
+ --m_countOfLRUAndUncacheableLists;
+
+ if (!uncacheable)
+ m_totalSizeOfLRUList -= object->size();
+}
+
+void Cache::moveToHeadOfLRUList(CachedObject *object)
+{
+ insertInLRUList(object);
+}
+
+void Cache::insertInLRUList(CachedObject *object)
+{
+ removeFromLRUList(object);
+
+ bool uncacheable = object->status() == CachedObject::Uncacheable;
+ CachedObject *&head = uncacheable ? m_headOfUncacheableList : m_headOfLRUList;
+
+ object->m_nextInLRUList = head;
+ if (head)
+ head->m_prevInLRUList = object;
+ head = object;
+
+ if (object->m_nextInLRUList == 0 && !uncacheable)
+ m_tailOfLRUList = object;
+
+ ++m_countOfLRUAndUncacheableLists;
+
+ if (!uncacheable)
+ m_totalSizeOfLRUList += object->size();
+}
// --------------------------------------
@@ -1779,7 +1826,6 @@ void Cache::flushAll()
break;
removeCacheEntry(o);
}
- cacheSize = 0;
}
void Cache::setCacheDisabled(bool disabled)
diff --git a/WebCore/khtml/misc/loader.h b/WebCore/khtml/misc/loader.h
index 6dc8e59..14187ed 100644
--- a/WebCore/khtml/misc/loader.h
+++ b/WebCore/khtml/misc/loader.h
@@ -111,11 +111,10 @@ namespace khtml
m_expireDate = _expireDate;
m_deleted = false;
m_expireDateChanged = false;
+ m_nextInLRUList = 0;
+ m_prevInLRUList = 0;
}
- virtual ~CachedObject() {
- if(m_deleted) abort();
- m_deleted = true;
- }
+ virtual ~CachedObject();
virtual void data( QBuffer &buffer, bool eof) = 0;
virtual void error( int err, const char *text ) = 0;
@@ -123,12 +122,11 @@ namespace khtml
const DOM::DOMString &url() const { return m_url; }
Type type() const { return m_type; }
- virtual void ref(CachedObjectClient *consumer) = 0;
- virtual void deref(CachedObjectClient *consumer) = 0;
+ virtual void ref(CachedObjectClient *consumer);
+ virtual void deref(CachedObjectClient *consumer);
int count() const { return m_clients.count(); }
- void setStatus(Status s) { m_status = s; }
Status status() const { return m_status; }
int size() const { return m_size; }
@@ -181,6 +179,13 @@ namespace khtml
bool m_deleted : 1;
bool m_loading : 1;
bool m_expireDateChanged : 1;
+
+ private:
+ bool allowInLRUList() { return canDelete() && status() != Persistent; }
+
+ CachedObject *m_nextInLRUList;
+ CachedObject *m_prevInLRUList;
+ friend class Cache;
};
@@ -492,7 +497,6 @@ namespace khtml
static QPixmap *nullPixmap;
static QPixmap *brokenPixmap;
- static int cacheSize;
static void removeCacheEntry( CachedObject *object );
@@ -516,27 +520,11 @@ namespace khtml
static void setCacheDisabled(bool);
#endif
- protected:
- /*
- * @internal
- */
- class LRUList : public QStringList
- {
- public:
- /**
- * implements the LRU list
- * The least recently used item is at the beginning of the list.
- */
- void touch( const QString &url )
- {
- remove( url );
- prepend( url );
- }
- };
-
+ static void insertInLRUList(CachedObject *);
+ static void removeFromLRUList(CachedObject *);
+ protected:
static QDict<CachedObject> *cache;
- static LRUList *lru;
static QPtrList<DocLoader>* docloader;
static int maxSize;
@@ -545,6 +533,16 @@ namespace khtml
static Loader *m_loader;
static unsigned long s_ulRefCnt;
+
+ static void moveToHeadOfLRUList(CachedObject *);
+
+ static CachedObject *m_headOfLRUList;
+ static CachedObject *m_tailOfLRUList;
+ static int m_totalSizeOfLRUList;
+
+ static CachedObject *m_headOfUncacheableList;
+
+ static int m_countOfLRUAndUncacheableLists;
};
};
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 5723c39..d3a1175 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -125,8 +125,7 @@ bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
bool KWQCheckIfReloading(DocLoader *loader)
{
- WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
- return [bridge dataSourceIsReloading];
+ return [((KHTMLPart *)loader->part())->impl->getBridge() isReloading];
}
void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 5723c39..d3a1175 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -125,8 +125,7 @@ bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
bool KWQCheckIfReloading(DocLoader *loader)
{
- WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
- return [bridge dataSourceIsReloading];
+ return [((KHTMLPart *)loader->part())->impl->getBridge() isReloading];
}
void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 1320888..957dfe4 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -161,7 +161,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (WebResourceHandle *)startLoadingResource:(id <WebCoreResourceLoader>)loader withURL:(NSURL *)URL;
- (void)reportError:(WebError *)error;
- (void)objectLoadedFromCache:(NSURL *)URL size:(unsigned)bytes;
-- (BOOL)dataSourceIsReloading;
+- (BOOL)isReloading;
- (void)reportClientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date;
- (void)reportClientRedirectCancelled;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0b0d7ee..1c16cf2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-12 Darin Adler <darin at apple.com>
+
+ * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge isReloading]):
+ Change dataSourceIsReloading to isReloading.
+
2002-08-12 Maciej Stachowiak <mjs at apple.com>
* WebView.subproj/WebDataSourcePrivate.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0b0d7ee..1c16cf2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-08-12 Darin Adler <darin at apple.com>
+
+ * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge isReloading]):
+ Change dataSourceIsReloading to isReloading.
+
2002-08-12 Maciej Stachowiak <mjs at apple.com>
* WebView.subproj/WebDataSourcePrivate.h:
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index faf2558..d8afa85 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -194,7 +194,7 @@
[handle release];
}
-- (BOOL)dataSourceIsReloading
+- (BOOL)isReloading
{
return ([[self dataSource] flags] & WebResourceHandleFlagLoadFromOrigin);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list