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/soup/ResourceRequest.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/soup/ResourceRequest.h')
| -rw-r--r-- | WebCore/platform/network/soup/ResourceRequest.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/WebCore/platform/network/soup/ResourceRequest.h b/WebCore/platform/network/soup/ResourceRequest.h index a1d916f..879a47f 100644 --- a/WebCore/platform/network/soup/ResourceRequest.h +++ b/WebCore/platform/network/soup/ResourceRequest.h @@ -67,8 +67,9 @@ namespace WebCore { updateFromSoupMessage(soupMessage); } + void updateSoupMessage(SoupMessage*) const; SoupMessage* toSoupMessage() const; - void updateFromSoupMessage(SoupMessage* soupMessage); + void updateFromSoupMessage(SoupMessage*); SoupMessageFlags soupMessageFlags() const { return m_soupFlags; } void setSoupMessageFlags(SoupMessageFlags soupFlags) { m_soupFlags = soupFlags; } @@ -80,6 +81,12 @@ namespace WebCore { void doUpdatePlatformRequest() {}; void doUpdateResourceRequest() {}; + + PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const { return data; } + void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>) { } + }; + + struct CrossThreadResourceRequestData : public CrossThreadResourceRequestDataBase { }; } // namespace WebCore |