| OLD | NEW |
| 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 #ifndef WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_ | 5 #ifndef WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_ |
| 6 #define WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_ | 6 #define WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_ |
| 7 | 7 |
| 8 #include "base/callback_old.h" |
| 8 #include "media/base/filters.h" | 9 #include "media/base/filters.h" |
| 9 #include "media/base/pipeline_status.h" | 10 #include "media/base/pipeline_status.h" |
| 10 | 11 |
| 11 namespace webkit_glue { | 12 namespace webkit_glue { |
| 12 | 13 |
| 13 // An interface that allows WebMediaPlayerImpl::Proxy to communicate with the | 14 // An interface that allows WebMediaPlayerImpl::Proxy to communicate with the |
| 14 // DataSource in the pipeline. | 15 // DataSource in the pipeline. |
| 15 class WebDataSource : public media::DataSource { | 16 class WebDataSource : public media::DataSource { |
| 16 public: | 17 public: |
| 17 WebDataSource(); | 18 WebDataSource(); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 // once WebMediaPlayerImpl::Proxy is fixed so it doesn't have to track | 50 // once WebMediaPlayerImpl::Proxy is fixed so it doesn't have to track |
| 50 // WebDataSources. Proxy only has to track WebDataSources so it can call Abort() | 51 // WebDataSources. Proxy only has to track WebDataSources so it can call Abort() |
| 51 // on them at shutdown. Once cancellation is added to DataSource and pause | 52 // on them at shutdown. Once cancellation is added to DataSource and pause |
| 52 // support in Demuxers cancel pending reads, Proxy shouldn't have to keep | 53 // support in Demuxers cancel pending reads, Proxy shouldn't have to keep |
| 53 // a WebDataSource list or call Abort(). | 54 // a WebDataSource list or call Abort(). |
| 54 typedef Callback1<WebDataSource*>::Type WebDataSourceBuildObserverHack; | 55 typedef Callback1<WebDataSource*>::Type WebDataSourceBuildObserverHack; |
| 55 | 56 |
| 56 } // namespace webkit_glue | 57 } // namespace webkit_glue |
| 57 | 58 |
| 58 #endif // WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_ | 59 #endif // WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_ |
| OLD | NEW |