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

Side by Side Diff: media/base/composite_data_source_factory.cc

Issue 6686061: PipelineError is dead. Long live PipelineStatus! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: responses to 2nd CR Created 9 years, 9 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 | « media/base/async_filter_factory_base.cc ('k') | media/base/composite_filter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "media/base/composite_data_source_factory.h" 5 #include "media/base/composite_data_source_factory.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/scoped_ptr.h" 9 #include "base/scoped_ptr.h"
10 #include "base/stl_util-inl.h" 10 #include "base/stl_util-inl.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 class CompositeDataSourceFactory::BuildRequest 14 class CompositeDataSourceFactory::BuildRequest
15 : public AsyncDataSourceFactoryBase::BuildRequest { 15 : public AsyncDataSourceFactoryBase::BuildRequest {
16 public: 16 public:
17 BuildRequest(const std::string& url, BuildCallback* callback, 17 BuildRequest(const std::string& url, BuildCallback* callback,
18 const FactoryList& factories); 18 const FactoryList& factories);
19 ~BuildRequest(); 19 ~BuildRequest();
20 20
21 protected: 21 protected:
22 // AsyncDataSourceFactoryBase::BuildRequest method. 22 // AsyncDataSourceFactoryBase::BuildRequest method.
23 virtual void DoStart(); 23 virtual void DoStart();
24 24
25 private: 25 private:
26 void CallNextFactory(); 26 void CallNextFactory();
27 void OnBuildDone(PipelineError error, DataSource* data_source); 27 void OnBuildDone(PipelineStatus status, DataSource* data_source);
28 28
29 FactoryList factories_; 29 FactoryList factories_;
30 }; 30 };
31 31
32 CompositeDataSourceFactory::CompositeDataSourceFactory() {} 32 CompositeDataSourceFactory::CompositeDataSourceFactory() {}
33 33
34 CompositeDataSourceFactory::~CompositeDataSourceFactory() { 34 CompositeDataSourceFactory::~CompositeDataSourceFactory() {
35 STLDeleteElements(&factories_); 35 STLDeleteElements(&factories_);
36 } 36 }
37 37
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 void CompositeDataSourceFactory::BuildRequest::CallNextFactory() { 80 void CompositeDataSourceFactory::BuildRequest::CallNextFactory() {
81 DCHECK(!factories_.empty()); 81 DCHECK(!factories_.empty());
82 82
83 DataSourceFactory* factory = factories_.front(); 83 DataSourceFactory* factory = factories_.front();
84 factories_.pop_front(); 84 factories_.pop_front();
85 85
86 factory->Build(url(), NewCallback(this, &BuildRequest::OnBuildDone)); 86 factory->Build(url(), NewCallback(this, &BuildRequest::OnBuildDone));
87 } 87 }
88 88
89 void CompositeDataSourceFactory::BuildRequest::OnBuildDone( 89 void CompositeDataSourceFactory::BuildRequest::OnBuildDone(
90 PipelineError error, 90 PipelineStatus status,
91 DataSource* data_source) { 91 DataSource* data_source) {
92 92
93 if (error == PIPELINE_OK) { 93 if (status == PIPELINE_OK) {
94 DCHECK(data_source); 94 DCHECK(data_source);
95 RequestComplete(error, data_source); 95 RequestComplete(status, data_source);
96 return; 96 return;
97 } 97 }
98 98
99 DCHECK(!data_source); 99 DCHECK(!data_source);
100 if ((error == DATASOURCE_ERROR_URL_NOT_SUPPORTED) && !factories_.empty()) { 100 if ((status == DATASOURCE_ERROR_URL_NOT_SUPPORTED) && !factories_.empty()) {
101 CallNextFactory(); 101 CallNextFactory();
102 return; 102 return;
103 } 103 }
104 104
105 RequestComplete(error, data_source); 105 RequestComplete(status, data_source);
106 } 106 }
107 107
108 } // namespace media 108 } // namespace media
OLDNEW
« no previous file with comments | « media/base/async_filter_factory_base.cc ('k') | media/base/composite_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698