[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 39e4f493149afd5f852b4571c36f07b46a09155d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 11 04:41:57 2004 +0000

    	Eliminate the double-completion and double-parsing of KURLs for every single image request.
    
            * khtml/misc/loader.cpp:
            (DocLoader::requestImage):
            (Cache::requestImage):
            * khtml/misc/loader.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8235c43..4610ed4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-02-10  David Hyatt  <hyatt at apple.com>
 
+	Eliminate the double-completion and double-parsing of KURLs for every single image request.
+	
+        * khtml/misc/loader.cpp:
+        (DocLoader::requestImage):
+        (Cache::requestImage):
+        * khtml/misc/loader.h:
+
+2004-02-10  David Hyatt  <hyatt at apple.com>
+
 	Merged patch that fixes clear:both for floats.  This patch comes from the KHTML tree.
 	
         * khtml/rendering/render_block.cpp:
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index 03b53d9..87dc473 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -1149,11 +1149,11 @@ CachedImage *DocLoader::requestImage( const DOM::DOMString &url)
     bool reload = needReload(fullURL);
 
 #if APPLE_CHANGES
-    CachedImage *cachedObject = Cache::requestImage(this, url, reload, m_expireDate);
+    CachedImage *cachedObject = Cache::requestImage(this, fullURL, reload, m_expireDate);
     KWQCheckCacheObjectStatus(this, cachedObject);
     return cachedObject;
 #else
-    return Cache::requestImage(this, url, reload, m_expireDate);
+    return Cache::requestImage(this, fullURL, reload, m_expireDate);
 #endif
 }
 
@@ -1565,17 +1565,20 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
 {
     // this brings the _url to a standard form...
     KURL kurl;
-    KIO::CacheControl cachePolicy;
-    if ( dl )
-    {
+    if (dl)
         kurl = dl->m_doc->completeURL( url.string() );
-        cachePolicy = dl->cachePolicy();
-    }
     else
-    {
         kurl = url.string();
+    return requestImage(dl, kurl, reload, _expireDate);
+}
+
+CachedImage *Cache::requestImage( DocLoader* dl, const KURL & url, bool reload, time_t _expireDate )
+{
+    KIO::CacheControl cachePolicy;
+    if (dl)
+        cachePolicy = dl->cachePolicy();
+    else
         cachePolicy = KIO::CC_Verify;
-    }
 
 #if APPLE_CHANGES
     // Checking if the URL is malformed is lots of extra work for little benefit.
@@ -1598,20 +1601,20 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
 
     CachedObject *o = 0;
     if (!reload)
-        o = cache->find(kurl.url());
+        o = cache->find(url.url());
     if(!o)
     {
 #ifdef CACHE_DEBUG
-        kdDebug( 6060 ) << "Cache: new: " << kurl.url() << endl;
+        kdDebug( 6060 ) << "Cache: new: " << url.url() << endl;
 #endif
-        CachedImage *im = new CachedImage(dl, kurl.url(), cachePolicy, _expireDate);
+        CachedImage *im = new CachedImage(dl, url.url(), cachePolicy, _expireDate);
         if ( dl && dl->autoloadImages() ) Cache::loader()->load(dl, im, true);
 #if APPLE_CHANGES
         if (cacheDisabled)
             im->setFree(true);
         else {
 #endif
-        cache->insert( kurl.url(), im );
+        cache->insert( url.url(), im );
         moveToHeadOfLRUList(im);
 #if APPLE_CHANGES
         }
diff --git a/WebCore/khtml/misc/loader.h b/WebCore/khtml/misc/loader.h
index 7608809..85e7f2f 100644
--- a/WebCore/khtml/misc/loader.h
+++ b/WebCore/khtml/misc/loader.h
@@ -519,6 +519,7 @@ protected:
          * Otherwise, it is automatically base-url expanded
 	 */
 	static CachedImage *requestImage( DocLoader* l, const DOM::DOMString &url, bool reload=false, time_t _expireDate=0);
+        static CachedImage *requestImage( DocLoader* l, const KURL &url, bool reload=false, time_t _expireDate=0);
 
 	/**
 	 * Ask the cache for some url. Will return a cachedObject, and

-- 
WebKit Debian packaging