diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/network/ResourceRequestBase.h | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/network/ResourceRequestBase.h')
-rw-r--r-- | WebCore/platform/network/ResourceRequestBase.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/WebCore/platform/network/ResourceRequestBase.h b/WebCore/platform/network/ResourceRequestBase.h index 1622cdd..33a184e 100644 --- a/WebCore/platform/network/ResourceRequestBase.h +++ b/WebCore/platform/network/ResourceRequestBase.h @@ -136,10 +136,16 @@ namespace WebCore { bool reportLoadTiming() const { return m_reportLoadTiming; } void setReportLoadTiming(bool reportLoadTiming) { m_reportLoadTiming = reportLoadTiming; } + // Whether actual headers being sent/received should be collected and reported for the request. + bool reportRawHeaders() const { return m_reportRawHeaders; } + void setReportRawHeaders(bool reportRawHeaders) { m_reportRawHeaders = reportRawHeaders; } + // What this request is for. TargetType targetType() const { return m_targetType; } void setTargetType(TargetType type) { m_targetType = type; } + static bool compare(const ResourceRequest&, const ResourceRequest&); + protected: // Used when ResourceRequest is initialized from a platform representation of the request ResourceRequestBase() @@ -147,6 +153,7 @@ namespace WebCore { , m_platformRequestUpdated(true) , m_reportUploadProgress(false) , m_reportLoadTiming(false) + , m_reportRawHeaders(false) , m_targetType(TargetIsSubresource) { } @@ -161,6 +168,7 @@ namespace WebCore { , m_platformRequestUpdated(false) , m_reportUploadProgress(false) , m_reportLoadTiming(false) + , m_reportRawHeaders(false) , m_targetType(TargetIsSubresource) { } @@ -168,6 +176,9 @@ namespace WebCore { void updatePlatformRequest() const; void updateResourceRequest() const; + // The ResourceRequest subclass may "shadow" this method to compare platform specific fields + static bool platformCompare(const ResourceRequest&, const ResourceRequest&) { return true; } + KURL m_url; ResourceRequestCachePolicy m_cachePolicy; @@ -182,6 +193,7 @@ namespace WebCore { mutable bool m_platformRequestUpdated; bool m_reportUploadProgress; bool m_reportLoadTiming; + bool m_reportRawHeaders; TargetType m_targetType; private: @@ -190,10 +202,10 @@ namespace WebCore { bool equalIgnoringHeaderFields(const ResourceRequestBase&, const ResourceRequestBase&); - bool operator==(const ResourceRequestBase&, const ResourceRequestBase&); - inline bool operator!=(ResourceRequestBase& a, const ResourceRequestBase& b) { return !(a == b); } + inline bool operator==(const ResourceRequest& a, const ResourceRequest& b) { return ResourceRequestBase::compare(a, b); } + inline bool operator!=(ResourceRequest& a, const ResourceRequest& b) { return !(a == b); } - struct CrossThreadResourceRequestData : Noncopyable { + struct CrossThreadResourceRequestDataBase : Noncopyable { KURL m_url; ResourceRequestCachePolicy m_cachePolicy; |