Changeset 17937 in webkit
- Timestamp:
- Nov 29, 2006 7:26:15 PM (17 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r17936 r17937 1 2006-11-29 Anders Carlsson <acarlsson@apple.com> 2 3 Reviewed by Brady. 4 5 Get rid of PlatformResponse, the platform specific response object is stored inside of 6 the ResourceResponse object now. This also gets rid of receivedResponse in ResourceHandleClient. 7 8 * bridge/mac/WebCoreFrameBridge.mm: 9 (-[WebCoreFrameBridge getData:andResponse:forURL:]): 10 (-[WebCoreFrameBridge getAllResourceDatas:andResponses:]): 11 * loader/CachedResource.cpp: 12 (WebCore::CachedResource::CachedResource): 13 (WebCore::CachedResource::~CachedResource): 14 * loader/CachedResource.h: 15 (WebCore::CachedResource::response): 16 * loader/loader.cpp: 17 * loader/loader.h: 18 * loader/mac/ImageDocumentMac.mm: 19 (WebCore::finishImageLoad): 20 * loader/mac/LoaderFunctionsMac.mm: 21 (WebCore::CheckCacheObjectStatus): 22 * loader/mac/SubresourceLoaderMac.mm: 23 (WebCore::SubresourceLoader::didReceiveResponse): 24 * platform/network/ResourceHandle.h: 25 * platform/network/ResourceResponse.h: 26 (WebCore::ResourceResponse::nsURLResponse): 27 (WebCore::ResourceResponse::cfURLResponse): 28 * platform/network/mac/ResourceHandleMac.mm: 29 (WebCore::ResourceHandle::didReceiveResponse): 30 1 31 2006-11-29 Justin Garcia <justin.garcia@apple.com> 2 32 -
trunk/WebCore/bridge/mac/WebCoreFrameBridge.mm
r17918 r17937 1617 1617 1618 1618 *data = resource->allData(); 1619 *response = resource-> platformResponse();1619 *response = resource->response().nsURLResponse(); 1620 1620 return YES; 1621 1621 } … … 1639 1639 for (HashMap<String, CachedResource*>::const_iterator it = allResources.begin(); it != end; ++it) { 1640 1640 [d addObject:it->second->allData()]; 1641 [r addObject:it->second-> platformResponse()];1641 [r addObject:it->second->response().nsURLResponse()]; 1642 1642 } 1643 1643 -
trunk/WebCore/loader/CachedResource.cpp
r17595 r17937 50 50 m_cachePolicy = cachePolicy; 51 51 m_request = 0; 52 m_platformResponse = 0;53 52 m_allData = 0; 54 53 m_expireDateChanged = false; … … 69 68 m_deleted = true; 70 69 #endif 71 setPlatformResponse(0);72 70 setAllData(0); 73 71 } -
trunk/WebCore/loader/CachedResource.h
r17595 r17937 122 122 void setRequest(Request*); 123 123 124 PlatformResponse platformResponse() const { return m_platformResponse; }125 void setPlatformResponse(PlatformResponse);126 124 PlatformData allData() const { return m_allData; } 127 125 void setAllData(PlatformData); 128 126 129 127 void setResponse(const ResourceResponse& response) { m_response = response; } 130 128 const ResourceResponse& response() const { return m_response; } 129 131 130 bool canDelete() const { return !referenced() && !m_request; } 132 131 … … 158 157 159 158 ResourceResponse m_response; 160 PlatformResponse m_platformResponse;161 159 PlatformData m_allData; 162 160 -
trunk/WebCore/loader/loader.cpp
r17682 r17937 135 135 136 136 servePendingRequests(); 137 }138 139 void Loader::receivedResponse(ResourceHandle* handle, PlatformResponse response)140 {141 Request* req = m_requestsLoading.get(handle);142 ASSERT(req);143 #if !PLATFORM(WIN)144 // FIXME: the win32 platform does not have PlatformResponse yet.145 ASSERT(response);146 #endif147 req->cachedResource()->setPlatformResponse(response);148 137 } 149 138 -
trunk/WebCore/loader/loader.h
r17682 r17937 64 64 65 65 private: 66 virtual void receivedResponse(ResourceHandle*, PlatformResponse);67 66 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&); 68 67 virtual void didReceiveData(ResourceHandle*, const char*, int); -
trunk/WebCore/loader/mac/ImageDocumentMac.mm
r17595 r17937 46 46 Frame* frame = document->frame(); 47 47 NSURLResponse *response = frame->loader()->documentLoader()->response(); 48 image->setPlatformResponse(response);49 48 50 49 IntSize size = image->imageSize(); -
trunk/WebCore/loader/mac/LoaderFunctionsMac.mm
r17652 r17937 130 130 } 131 131 132 ASSERT(cachedResource->platformResponse());133 134 132 // Notify the caller that we "loaded". 135 133 FrameMac *frame = static_cast<FrameMac *>(loader->frame()); … … 139 137 140 138 NSURLRequest *request = cachedResource->getNSURLRequest(); 141 NSURLResponse *response = cachedResource-> platformResponse();139 NSURLResponse *response = cachedResource->response().nsURLResponse(); 142 140 NSData *data = cachedResource->allData(); 143 141 … … 196 194 } 197 195 198 void CachedResource::setPlatformResponse(PlatformResponse response)199 {200 HardRetain(response);201 BEGIN_BLOCK_OBJC_EXCEPTIONS;202 HardRelease(m_platformResponse);203 END_BLOCK_OBJC_EXCEPTIONS;204 205 m_platformResponse = response;206 }207 208 196 void CachedResource::setAllData(PlatformData allData) 209 197 { -
trunk/WebCore/loader/mac/SubresourceLoaderMac.mm
r17755 r17937 126 126 RefPtr<SubresourceLoader> protect(this); 127 127 128 m_handle-> receivedResponse(r);128 m_handle->didReceiveResponse(r); 129 129 // The loader can cancel a load if it receives a multipart response for a non-image 130 130 if (reachedTerminalState()) -
trunk/WebCore/platform/network/ResourceHandle.h
r17762 r17937 79 79 #if PLATFORM(MAC) 80 80 NSURLRequest *willSendRequest(NSURLRequest *, NSURLResponse *); 81 void didReceiveResponse(NSURLResponse *); 81 82 void addData(NSData *); 82 83 void finishJobAndHandle(NSData *); … … 107 108 ResourceHandleClient* client() const; 108 109 109 void receivedResponse(PlatformResponse);110 111 110 const HTTPHeaderMap& requestHeaders() const; 112 111 const KURL& url() const; -
trunk/WebCore/platform/network/ResourceResponse.h
r17921 r17937 97 97 : m_isUpToDate(false) 98 98 , m_nsResponse(nsResponse) { } 99 100 NSURLResponse *nsURLResponse() const { return m_nsResponse.get(); } 99 101 #elif USE(CFNETWORK) 100 102 ResourceResponse(CFURLResponseRef cfResponse) 101 103 : m_isUpToDate(false) 102 104 , m_cfResponse(cfResponse) { } 105 106 CFURLResponseRef cfURLResponse() const { return m_cfResponse.get(); } 103 107 #endif 104 108 -
trunk/WebCore/platform/network/mac/ResourceHandleMac.mm
r17923 r17937 82 82 } 83 83 84 void ResourceHandle:: receivedResponse(NSURLResponse* nsResponse)84 void ResourceHandle::didReceiveResponse(NSURLResponse* nsResponse) 85 85 { 86 86 ASSERT(nsResponse); 87 87 88 if (client()) { 89 client()->receivedResponse(this, nsResponse); 90 client()->didReceiveResponse(this, nsResponse); 91 } 88 if (ResourceHandleClient* c = client()) 89 c->didReceiveResponse(this, nsResponse); 92 90 } 93 91
Note: See TracChangeset
for help on using the changeset viewer.