Reviewed by Darin.
authorandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Jul 2007 17:12:22 +0000 (17:12 +0000)
committerandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Jul 2007 17:12:22 +0000 (17:12 +0000)
        Remove a bunch of unneeded accessors from ResourceHandle.

        * loader/icon/IconLoader.cpp:
        (WebCore::IconLoader::didReceiveResponse):
        (WebCore::IconLoader::didFail):
        (WebCore::IconLoader::didFinishLoading):
        * platform/network/ResourceHandle.cpp:
        * platform/network/ResourceHandle.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24202 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/loader/icon/IconLoader.cpp
WebCore/platform/network/ResourceHandle.cpp
WebCore/platform/network/ResourceHandle.h

index 68144ca7cc4853a889af1815a0ad29444f494fc5..73def292e3d5578b87b361a98eb130e00d08e79d 100644 (file)
@@ -1,3 +1,16 @@
+2007-07-11  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin.
+
+        Remove a bunch of unneeded accessors from ResourceHandle.
+        
+        * loader/icon/IconLoader.cpp:
+        (WebCore::IconLoader::didReceiveResponse):
+        (WebCore::IconLoader::didFail):
+        (WebCore::IconLoader::didFinishLoading):
+        * platform/network/ResourceHandle.cpp:
+        * platform/network/ResourceHandle.h:
+
 2007-07-09  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by Darin.
index 35d0fa6448409ca150212f975f998ec256fe6247..8f2f6d39193ec0a770e67b79f73fbaf560603382 100644 (file)
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
index d2293ce9a1ca687ce42f49c8288bbf60a89d829d..e6ad850b1492584e56f1d967d353645e60a483fe 100644 (file)
@@ -96,7 +96,7 @@ void IconLoader::didReceiveResponse(SubresourceLoader* resourceLoader, const Res
     LOG(IconDatabase, "IconLoader::didReceiveResponse() - Loader %p, response %i", resourceLoader, status);
     if (status && (status < 200 || status > 299)) {
         ResourceHandle* handle = resourceLoader->handle();
-        finishLoading(handle ? handle->url() : KURL());
+        finishLoading(handle ? handle->request().url() : KURL());
         m_resourceLoader = 0;
     }
 }
@@ -112,7 +112,7 @@ void IconLoader::didFail(SubresourceLoader* resourceLoader, const ResourceError&
     ASSERT(resourceLoader == m_resourceLoader);
     ASSERT(m_loadIsInProgress);
     ResourceHandle* handle = resourceLoader->handle();
-    finishLoading(handle ? handle->url() : KURL());
+    finishLoading(handle ? handle->request().url() : KURL());
 }
 
 void IconLoader::didFinishLoading(SubresourceLoader* resourceLoader)
@@ -123,7 +123,7 @@ void IconLoader::didFinishLoading(SubresourceLoader* resourceLoader)
     if (m_loadIsInProgress) {
         ASSERT(resourceLoader == m_resourceLoader);
         ResourceHandle* handle = resourceLoader->handle();
-        finishLoading(handle ? handle->url() : KURL());
+        finishLoading(handle ? handle->request().url() : KURL());
     }
 }
 
index a029a7bd89303d48706972f08719e3568eeea737..59a46d982366279119365ce7dcfc1b23c8f2b78e 100644 (file)
@@ -68,26 +68,6 @@ void ResourceHandle::fireBlockedFailure(Timer<ResourceHandle>* timer)
     delete timer;
 }
 
-const HTTPHeaderMap& ResourceHandle::requestHeaders() const
-{
-    return d->m_request.httpHeaderFields();
-}
-
-const KURL& ResourceHandle::url() const
-{
-    return d->m_request.url();
-}
-
-PassRefPtr<FormData> ResourceHandle::postData() const
-{
-    return d->m_request.httpBody();
-}
-
-const String& ResourceHandle::method() const
-{
-    return d->m_request.httpMethod();
-}
-
 ResourceHandleClient* ResourceHandle::client() const
 {
     return d->m_client;
index d78945b66cba4503250cb9d1f8bd06ba74f95573..a4e7ebc58ce887ddb0a783ead9cbb1a9526eb750 100644 (file)
@@ -152,10 +152,6 @@ public:
     ResourceHandleClient* client() const;
     void setDefersLoading(bool);
       
-    const HTTPHeaderMap& requestHeaders() const;
-    const KURL& url() const;
-    const String& method() const;
-    PassRefPtr<FormData> postData() const;
     const ResourceRequest& request() const;
 
     void fireBlockedFailure(Timer<ResourceHandle>*);