diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/platform/network/ResourceResponseBase.h | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/platform/network/ResourceResponseBase.h')
| -rw-r--r-- | WebCore/platform/network/ResourceResponseBase.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/platform/network/ResourceResponseBase.h b/WebCore/platform/network/ResourceResponseBase.h index 4da13bb..9c54bab 100644 --- a/WebCore/platform/network/ResourceResponseBase.h +++ b/WebCore/platform/network/ResourceResponseBase.h @@ -29,8 +29,8 @@ #include "HTTPHeaderMap.h" #include "KURL.h" +#include "ResourceLoadInfo.h" #include "ResourceLoadTiming.h" -#include "ResourceRawHeaders.h" #include <wtf/PassOwnPtr.h> #include <wtf/RefPtr.h> @@ -110,8 +110,8 @@ public: ResourceLoadTiming* resourceLoadTiming() const; void setResourceLoadTiming(PassRefPtr<ResourceLoadTiming>); - PassRefPtr<ResourceRawHeaders> resourceRawHeaders() const; - void setResourceRawHeaders(PassRefPtr<ResourceRawHeaders>); + PassRefPtr<ResourceLoadInfo> resourceLoadInfo() const; + void setResourceLoadInfo(PassRefPtr<ResourceLoadInfo>); // The ResourceResponse subclass may "shadow" this method to provide platform-specific memory usage information unsigned memoryUsage() const @@ -147,7 +147,7 @@ protected: unsigned m_connectionID; bool m_connectionReused : 1; RefPtr<ResourceLoadTiming> m_resourceLoadTiming; - RefPtr<ResourceRawHeaders> m_resourceRawHeaders; + RefPtr<ResourceLoadInfo> m_resourceLoadInfo; bool m_isNull : 1; |