[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 05:59:24 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5cbc4e217b4d2f083728c25afc730ec301c37455
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 29 01:13:14 2002 +0000
* src/kwq/KWQKloader.mm: (Cache::requestImage), (Cache::requestStyleSheet),
(Cache::requestScript): Set flags so the objects get freed when they are done
in cases where the cache is disabled.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@884 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b88f2c6..ad90c1e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-03-28 Darin Adler <darin at apple.com>
+
+ * src/kwq/KWQKloader.mm: (Cache::requestImage), (Cache::requestStyleSheet),
+ (Cache::requestScript): Set flags so the objects get freed when they are done
+ in cases where the cache is disabled.
+
2002-03-28 Maciej Stachowiak <mjs at apple.com>
Fix Radar 2890340 (JavaScript doesn't work)
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b88f2c6..ad90c1e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-03-28 Darin Adler <darin at apple.com>
+
+ * src/kwq/KWQKloader.mm: (Cache::requestImage), (Cache::requestStyleSheet),
+ (Cache::requestScript): Set flags so the objects get freed when they are done
+ in cases where the cache is disabled.
+
2002-03-28 Maciej Stachowiak <mjs at apple.com>
Fix Radar 2890340 (JavaScript doesn't work)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b88f2c6..ad90c1e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-03-28 Darin Adler <darin at apple.com>
+
+ * src/kwq/KWQKloader.mm: (Cache::requestImage), (Cache::requestStyleSheet),
+ (Cache::requestScript): Set flags so the objects get freed when they are done
+ in cases where the cache is disabled.
+
2002-03-28 Maciej Stachowiak <mjs at apple.com>
Fix Radar 2890340 (JavaScript doesn't work)
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index a3a65c8..34b5e2f 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1466,7 +1466,9 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
CachedImage *im = new CachedImage(dl, kurl.url(), reload, _expireDate);
if ( dl && dl->autoloadImages() ) Cache::loader()->load(dl, im, true);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ im->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), im );
lru->prepend( kurl.url() );
@@ -1497,6 +1499,9 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedImage *>(o);
@@ -1519,7 +1524,9 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
#endif
CachedCSSStyleSheet *sheet = new CachedCSSStyleSheet(dl, kurl.url(), reload, _expireDate, charset);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ sheet->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), sheet );
lru->prepend( kurl.url() );
@@ -1550,6 +1557,9 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedCSSStyleSheet *>(o);
@@ -1572,7 +1582,9 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
#endif
CachedScript *script = new CachedScript(dl, kurl.url(), reload, _expireDate, charset);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ script->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), script );
lru->prepend( kurl.url() );
@@ -1603,6 +1615,9 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedScript *>(o);
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index a3a65c8..34b5e2f 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1466,7 +1466,9 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
CachedImage *im = new CachedImage(dl, kurl.url(), reload, _expireDate);
if ( dl && dl->autoloadImages() ) Cache::loader()->load(dl, im, true);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ im->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), im );
lru->prepend( kurl.url() );
@@ -1497,6 +1499,9 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedImage *>(o);
@@ -1519,7 +1524,9 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
#endif
CachedCSSStyleSheet *sheet = new CachedCSSStyleSheet(dl, kurl.url(), reload, _expireDate, charset);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ sheet->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), sheet );
lru->prepend( kurl.url() );
@@ -1550,6 +1557,9 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedCSSStyleSheet *>(o);
@@ -1572,7 +1582,9 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
#endif
CachedScript *script = new CachedScript(dl, kurl.url(), reload, _expireDate, charset);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ script->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), script );
lru->prepend( kurl.url() );
@@ -1603,6 +1615,9 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedScript *>(o);
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index a3a65c8..34b5e2f 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1466,7 +1466,9 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
CachedImage *im = new CachedImage(dl, kurl.url(), reload, _expireDate);
if ( dl && dl->autoloadImages() ) Cache::loader()->load(dl, im, true);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ im->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), im );
lru->prepend( kurl.url() );
@@ -1497,6 +1499,9 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedImage *>(o);
@@ -1519,7 +1524,9 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
#endif
CachedCSSStyleSheet *sheet = new CachedCSSStyleSheet(dl, kurl.url(), reload, _expireDate, charset);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ sheet->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), sheet );
lru->prepend( kurl.url() );
@@ -1550,6 +1557,9 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedCSSStyleSheet *>(o);
@@ -1572,7 +1582,9 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
#endif
CachedScript *script = new CachedScript(dl, kurl.url(), reload, _expireDate, charset);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ script->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), script );
lru->prepend( kurl.url() );
@@ -1603,6 +1615,9 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedScript *>(o);
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index a3a65c8..34b5e2f 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1466,7 +1466,9 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
CachedImage *im = new CachedImage(dl, kurl.url(), reload, _expireDate);
if ( dl && dl->autoloadImages() ) Cache::loader()->load(dl, im, true);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ im->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), im );
lru->prepend( kurl.url() );
@@ -1497,6 +1499,9 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedImage *>(o);
@@ -1519,7 +1524,9 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
#endif
CachedCSSStyleSheet *sheet = new CachedCSSStyleSheet(dl, kurl.url(), reload, _expireDate, charset);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ sheet->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), sheet );
lru->prepend( kurl.url() );
@@ -1550,6 +1557,9 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedCSSStyleSheet *>(o);
@@ -1572,7 +1582,9 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
#endif
CachedScript *script = new CachedScript(dl, kurl.url(), reload, _expireDate, charset);
#ifdef APPLE_CHANGES
- if (!cacheDisabled) {
+ if (cacheDisabled)
+ script->setFree(true);
+ else {
#endif
cache->insert( kurl.url(), script );
lru->prepend( kurl.url() );
@@ -1603,6 +1615,9 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
lru->touch( kurl.url() );
if ( dl ) {
dl->m_docObjects.remove( o );
+#ifdef APPLE_CHANGES
+ if (!cacheDisabled)
+#endif
dl->m_docObjects.append( o );
}
return static_cast<CachedScript *>(o);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list