diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 02:27:34 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 02:27:34 +0000 |
| commit | 041b0bbba0efec8bd026aee1165e4be697cbf8ce (patch) | |
| tree | 8c9ee6806d964c45252a56f911f3c43491a38fc4 /webkit/glue/media | |
| parent | 4eb0ece6c4b380e6af418ab15beda8c13ed08817 (diff) | |
| download | chromium_src-041b0bbba0efec8bd026aee1165e4be697cbf8ce.zip chromium_src-041b0bbba0efec8bd026aee1165e4be697cbf8ce.tar.gz chromium_src-041b0bbba0efec8bd026aee1165e4be697cbf8ce.tar.bz2 | |
Use an explicit boolean has_new_first_party_for_cookies instead
of an empty, invalid URL to indicate whether the first party for
cookies URL needs changing when following a redirect.
R=eroman
BUG=25133
TEST=none
Review URL: http://codereview.chromium.org/405011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/media')
| -rw-r--r-- | webkit/glue/media/buffered_data_source.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/media/buffered_data_source.h | 1 | ||||
| -rw-r--r-- | webkit/glue/media/simple_data_source.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/media/simple_data_source.h | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc index 3d2c73f..cfc2d7c 100644 --- a/webkit/glue/media/buffered_data_source.cc +++ b/webkit/glue/media/buffered_data_source.cc @@ -231,12 +231,14 @@ int64 BufferedResourceLoader::GetBufferedLastBytePosition() { bool BufferedResourceLoader::OnReceivedRedirect( const GURL& new_url, const webkit_glue::ResourceLoaderBridge::ResponseInfo& info, + bool* has_new_first_party_for_cookies, GURL* new_first_party_for_cookies) { DCHECK(bridge_.get()); // Save the new URL. url_ = new_url; - *new_first_party_for_cookies = GURL(); + // TODO(wtc): should we return a new first party for cookies URL? + *has_new_first_party_for_cookies = false; // The load may have been stopped and |start_callback| is destroyed. // In this case we shouldn't do anything. diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h index 627f84d..0972c2d 100644 --- a/webkit/glue/media/buffered_data_source.h +++ b/webkit/glue/media/buffered_data_source.h @@ -110,6 +110,7 @@ class BufferedResourceLoader : virtual bool OnReceivedRedirect( const GURL& new_url, const webkit_glue::ResourceLoaderBridge::ResponseInfo& info, + bool* has_new_first_party_for_cookies, GURL* new_first_party_for_cookies); virtual void OnReceivedResponse( const webkit_glue::ResourceLoaderBridge::ResponseInfo& info, diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc index ed2a594..57b294a 100644 --- a/webkit/glue/media/simple_data_source.cc +++ b/webkit/glue/media/simple_data_source.cc @@ -123,9 +123,11 @@ void SimpleDataSource::OnUploadProgress(uint64 position, uint64 size) {} bool SimpleDataSource::OnReceivedRedirect( const GURL& new_url, const webkit_glue::ResourceLoaderBridge::ResponseInfo& info, + bool* has_new_first_party_for_cookies, GURL* new_first_party_for_cookies) { SetURL(new_url); - *new_first_party_for_cookies = GURL(); + // TODO(wtc): should we return a new first party for cookies URL? + *has_new_first_party_for_cookies = false; return true; } diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h index 3aac41b..10bbb7d 100644 --- a/webkit/glue/media/simple_data_source.h +++ b/webkit/glue/media/simple_data_source.h @@ -56,6 +56,7 @@ class SimpleDataSource : public media::DataSource, virtual bool OnReceivedRedirect( const GURL& new_url, const webkit_glue::ResourceLoaderBridge::ResponseInfo& info, + bool* has_new_first_party_for_cookies, GURL* new_first_party_for_cookies); virtual void OnReceivedResponse( const webkit_glue::ResourceLoaderBridge::ResponseInfo& info, |