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/curl/ResourceResponse.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/curl/ResourceResponse.h')
-rw-r--r-- | WebCore/platform/network/curl/ResourceResponse.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/WebCore/platform/network/curl/ResourceResponse.h b/WebCore/platform/network/curl/ResourceResponse.h index 860e902..49dd56c 100644 --- a/WebCore/platform/network/curl/ResourceResponse.h +++ b/WebCore/platform/network/curl/ResourceResponse.h @@ -28,7 +28,7 @@ #include "ResourceResponseBase.h" -typedef const struct _CFURLResponse* CFURLResponseRef; +typedef struct _CFURLResponse* CFURLResponseRef; namespace WebCore { @@ -52,9 +52,17 @@ public: CFURLResponseRef cfURLResponse() const { return 0; } private: + friend class ResourceResponseBase; + + PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const { return data; } + void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>) { } + bool m_responseFired; }; +struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataBase { +}; + } // namespace WebCore #endif // ResourceResponse_h |