Changeset 17937 in webkit

Timestamp:

Nov 29, 2006 7:26:15 PM (17 years ago)

Author:

andersca

Message:

Reviewed by Brady.

Get rid of PlatformResponse, the platform specific response object is stored inside of
the ResourceResponse object now. This also gets rid of receivedResponse in ResourceHandleClient.

• bridge/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge getData:andResponse:forURL:]): (-[WebCoreFrameBridge getAllResourceDatas:andResponses:]):
• loader/CachedResource.cpp: (WebCore::CachedResource::CachedResource): (WebCore::CachedResource::~CachedResource):
• loader/CachedResource.h: (WebCore::CachedResource::response):
• loader/loader.cpp:
• loader/loader.h:
• loader/mac/ImageDocumentMac.mm: (WebCore::finishImageLoad):
• loader/mac/LoaderFunctionsMac.mm: (WebCore::CheckCacheObjectStatus):
• loader/mac/SubresourceLoaderMac.mm: (WebCore::SubresourceLoader::didReceiveResponse):
• platform/network/ResourceHandle.h:
• platform/network/ResourceResponse.h: (WebCore::ResourceResponse::nsURLResponse): (WebCore::ResourceResponse::cfURLResponse):
• platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::didReceiveResponse):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/mac/WebCoreFrameBridge.mm (modified) (2 diffs)
• loader/CachedResource.cpp (modified) (2 diffs)
• loader/CachedResource.h (modified) (2 diffs)
• loader/loader.cpp (modified) (1 diff)
• loader/loader.h (modified) (1 diff)
• loader/mac/ImageDocumentMac.mm (modified) (1 diff)
• loader/mac/LoaderFunctionsMac.mm (modified) (3 diffs)
• loader/mac/SubresourceLoaderMac.mm (modified) (1 diff)
• platform/network/ResourceHandle.h (modified) (2 diffs)
• platform/network/ResourceResponse.h (modified) (1 diff)
• platform/network/mac/ResourceHandleMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-29  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Brady.
+
+        Get rid of PlatformResponse, the platform specific response object is stored inside of 
+        the ResourceResponse object now. This also gets rid of receivedResponse in ResourceHandleClient.
+        
+        * bridge/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge getData:andResponse:forURL:]):
+        (-[WebCoreFrameBridge getAllResourceDatas:andResponses:]):
+        * loader/CachedResource.cpp:
+        (WebCore::CachedResource::CachedResource):
+        (WebCore::CachedResource::~CachedResource):
+        * loader/CachedResource.h:
+        (WebCore::CachedResource::response):
+        * loader/loader.cpp:
+        * loader/loader.h:
+        * loader/mac/ImageDocumentMac.mm:
+        (WebCore::finishImageLoad):
+        * loader/mac/LoaderFunctionsMac.mm:
+        (WebCore::CheckCacheObjectStatus):
+        * loader/mac/SubresourceLoaderMac.mm:
+        (WebCore::SubresourceLoader::didReceiveResponse):
+        * platform/network/ResourceHandle.h:
+        * platform/network/ResourceResponse.h:
+        (WebCore::ResourceResponse::nsURLResponse):
+        (WebCore::ResourceResponse::cfURLResponse):
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::didReceiveResponse):
+
 2006-11-29  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/bridge/mac/WebCoreFrameBridge.mm

@@ -1617 +1617 @@
 
     *data = resource->allData();
-    *response = resource->platformResponse();
+    *response = resource->response().nsURLResponse();
     return YES;
 }
@@ -1639 +1639 @@
     for (HashMap<String, CachedResource*>::const_iterator it = allResources.begin(); it != end; ++it) {
         [d addObject:it->second->allData()];
-        [r addObject:it->second->platformResponse()];
+        [r addObject:it->second->response().nsURLResponse()];
     }
 

trunk/WebCore/loader/CachedResource.cpp

@@ -50 +50 @@
     m_cachePolicy = cachePolicy;
     m_request = 0;
-    m_platformResponse = 0;
     m_allData = 0;
     m_expireDateChanged = false;
@@ -69 +68 @@
     m_deleted = true;
 #endif
-    setPlatformResponse(0);
     setAllData(0);
 }

trunk/WebCore/loader/CachedResource.h

@@ -122 +122 @@
     void setRequest(Request*);
 
-    PlatformResponse platformResponse() const { return m_platformResponse; }
-    void setPlatformResponse(PlatformResponse);
     PlatformData allData() const { return m_allData; }
     void setAllData(PlatformData);
 
     void setResponse(const ResourceResponse& response) { m_response = response; }
-
+    const ResourceResponse& response() const { return m_response; }
+    
     bool canDelete() const { return !referenced() && !m_request; }
 
@@ -158 +157 @@
 
     ResourceResponse m_response;
-    PlatformResponse m_platformResponse;
     PlatformData m_allData;
 

trunk/WebCore/loader/loader.cpp

@@ -135 +135 @@
 
     servePendingRequests();
-}
-
-void Loader::receivedResponse(ResourceHandle* handle, PlatformResponse response)
-{
-    Request* req = m_requestsLoading.get(handle);
-    ASSERT(req);
-#if !PLATFORM(WIN)
-    // FIXME: the win32 platform does not have PlatformResponse yet.
-    ASSERT(response);
-#endif
-    req->cachedResource()->setPlatformResponse(response);
 }
 

trunk/WebCore/loader/loader.h

@@ -64 +64 @@
 
     private:
-        virtual void receivedResponse(ResourceHandle*, PlatformResponse);
         virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
         virtual void didReceiveData(ResourceHandle*, const char*, int);

trunk/WebCore/loader/mac/ImageDocumentMac.mm

@@ -46 +46 @@
     Frame* frame = document->frame();
     NSURLResponse *response = frame->loader()->documentLoader()->response();
-    image->setPlatformResponse(response);
 
     IntSize size = image->imageSize();

trunk/WebCore/loader/mac/LoaderFunctionsMac.mm

@@ -130 +130 @@
     }
     
-    ASSERT(cachedResource->platformResponse());
-    
     // Notify the caller that we "loaded".
     FrameMac *frame = static_cast<FrameMac *>(loader->frame());
@@ -139 +137 @@
         
     NSURLRequest *request = cachedResource->getNSURLRequest();
-    NSURLResponse *response = cachedResource->platformResponse();
+    NSURLResponse *response = cachedResource->response().nsURLResponse();
     NSData *data = cachedResource->allData();
     
@@ -196 +194 @@
 }
 
-void CachedResource::setPlatformResponse(PlatformResponse response)
-{
-    HardRetain(response);
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    HardRelease(m_platformResponse);
-    END_BLOCK_OBJC_EXCEPTIONS;
-
-    m_platformResponse = response;
-}
-
 void CachedResource::setAllData(PlatformData allData)
 {

trunk/WebCore/loader/mac/SubresourceLoaderMac.mm

@@ -126 +126 @@
     RefPtr<SubresourceLoader> protect(this);
 
-    m_handle->receivedResponse(r);
+    m_handle->didReceiveResponse(r);
     // The loader can cancel a load if it receives a multipart response for a non-image
     if (reachedTerminalState())

trunk/WebCore/platform/network/ResourceHandle.h

@@ -79 +79 @@
 #if PLATFORM(MAC)
     NSURLRequest *willSendRequest(NSURLRequest *, NSURLResponse *);
+    void didReceiveResponse(NSURLResponse *);  
     void addData(NSData *);
     void finishJobAndHandle(NSData *);
@@ -107 +108 @@
     ResourceHandleClient* client() const;
 
-    void receivedResponse(PlatformResponse);
-
     const HTTPHeaderMap& requestHeaders() const;
     const KURL& url() const;

trunk/WebCore/platform/network/ResourceResponse.h

@@ -97 +97 @@
         : m_isUpToDate(false)
         , m_nsResponse(nsResponse) { }
+    
+    NSURLResponse *nsURLResponse() const { return m_nsResponse.get(); }
 #elif USE(CFNETWORK)
     ResourceResponse(CFURLResponseRef cfResponse)
         : m_isUpToDate(false)
         , m_cfResponse(cfResponse) { }
+    
+    CFURLResponseRef cfURLResponse() const { return m_cfResponse.get(); }
 #endif
     

trunk/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -82 +82 @@
 }
 
-void ResourceHandle::receivedResponse(NSURLResponse* nsResponse)
+void ResourceHandle::didReceiveResponse(NSURLResponse* nsResponse)
 {
     ASSERT(nsResponse);
 
-    if (client()) {
-        client()->receivedResponse(this, nsResponse);
-        client()->didReceiveResponse(this, nsResponse);
-    }
+    if (ResourceHandleClient* c = client())
+        c->didReceiveResponse(this, nsResponse);
 }