| Index: third_party/WebKit/Source/core/fetch/Resource.h
|
| diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
|
| index 35e2f003e65d92010b6738bfba3d47434b7cce94..b5a244e424d33317a87366993690db730472ee84 100644
|
| --- a/third_party/WebKit/Source/core/fetch/Resource.h
|
| +++ b/third_party/WebKit/Source/core/fetch/Resource.h
|
| @@ -184,7 +184,7 @@ public:
|
| virtual void willNotFollowRedirect() {}
|
|
|
| virtual void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>);
|
| - void setResponse(const ResourceResponse& response) { m_response = response; }
|
| + void setResponse(const ResourceResponse&);
|
| const ResourceResponse& response() const { return m_response; }
|
|
|
| virtual void reportResourceTimingToClients(const ResourceTimingInfo&) { }
|
| @@ -304,8 +304,9 @@ protected:
|
| Timer<Resource> m_cancelTimer;
|
|
|
| private:
|
| - class CacheHandler;
|
| class ResourceCallback;
|
| + class CachedMetadataHandlerImpl;
|
| + class ServiceWorkerResponseCachedMetadataHandler;
|
|
|
| void cancelTimerFired(Timer<Resource>*);
|
|
|
| @@ -316,12 +317,8 @@ private:
|
|
|
| bool unlock();
|
|
|
| - void setCachedMetadata(unsigned dataTypeID, const char*, size_t, CachedMetadataHandler::CacheType);
|
| - void clearCachedMetadata(CachedMetadataHandler::CacheType);
|
| - CachedMetadata* cachedMetadata(unsigned dataTypeID) const;
|
| -
|
| - RefPtr<CachedMetadata> m_cachedMetadata;
|
| - Member<CacheHandler> m_cacheHandler;
|
| + Member<CachedMetadataHandlerImpl> m_cacheHandler;
|
| + RefPtr<SecurityOrigin> m_fetcherSecurityOrigin;
|
|
|
| ResourceError m_error;
|
|
|
|
|