Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: webkit/glue/media/simple_data_source.cc

Issue 165176: Merge 21999 - BufferedDataSource to support server without range request supp... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/media/simple_data_source.h ('k') | webkit/glue/webmediaplayer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/webkit/glue/media/simple_data_source.cc:r21999
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop.h" 5 #include "base/message_loop.h"
6 #include "base/process_util.h" 6 #include "base/process_util.h"
7 #include "media/base/filter_host.h" 7 #include "media/base/filter_host.h"
8 #include "net/base/load_flags.h" 8 #include "net/base/load_flags.h"
9 #include "net/http/http_response_headers.h" 9 #include "net/http/http_response_headers.h"
10 #include "net/url_request/url_request_status.h" 10 #include "net/url_request/url_request_status.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 read_callback->RunWithParams(Tuple1<size_t>(copied)); 94 read_callback->RunWithParams(Tuple1<size_t>(copied));
95 delete read_callback; 95 delete read_callback;
96 } 96 }
97 } 97 }
98 98
99 bool SimpleDataSource::GetSize(int64* size_out) { 99 bool SimpleDataSource::GetSize(int64* size_out) {
100 *size_out = size_; 100 *size_out = size_;
101 return true; 101 return true;
102 } 102 }
103 103
104 bool SimpleDataSource::IsSeekable() { 104 bool SimpleDataSource::IsStreaming() {
105 return true; 105 return false;
106 } 106 }
107 107
108 void SimpleDataSource::OnDownloadProgress(uint64 position, uint64 size) {} 108 void SimpleDataSource::OnDownloadProgress(uint64 position, uint64 size) {}
109 109
110 void SimpleDataSource::OnUploadProgress(uint64 position, uint64 size) {} 110 void SimpleDataSource::OnUploadProgress(uint64 position, uint64 size) {}
111 111
112 void SimpleDataSource::OnReceivedRedirect(const GURL& new_url) { 112 void SimpleDataSource::OnReceivedRedirect(const GURL& new_url) {
113 SetURL(new_url); 113 SetURL(new_url);
114 } 114 }
115 115
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 DCHECK_EQ(state_, STOPPED); 189 DCHECK_EQ(state_, STOPPED);
190 190
191 // Cancel any pending requests. 191 // Cancel any pending requests.
192 if (bridge_.get()) { 192 if (bridge_.get()) {
193 bridge_->Cancel(); 193 bridge_->Cancel();
194 bridge_.reset(); 194 bridge_.reset();
195 } 195 }
196 } 196 }
197 197
198 } // namespace webkit_glue 198 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/media/simple_data_source.h ('k') | webkit/glue/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698