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

Unified Diff: webkit/media/webmediaplayer_impl.h

Issue 10825280: Merge Pipeline's kError state with kStopped: a baby step towards bringing sanity to shutdown. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: maybe this time Created 8 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 side-by-side diff with in-line comments
Download patch
Index: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 3ef3c2732fb55ec702efc1a7a3732560d69258d8..d045faf154402c4126cd3b9dbafc8aa24c20a802 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -284,16 +284,8 @@ class WebMediaPlayerImpl
// for DCHECKs so methods calls won't execute in the wrong thread.
MessageLoop* main_loop_;
- // A collection of filters.
scoped_ptr<media::FilterCollection> filter_collection_;
-
- // The media pipeline and a bool tracking whether we have started it yet.
- //
- // TODO(scherkus): replace |started_| with a pointer check for |pipeline_| and
- // have WebMediaPlayerImpl return the default values to WebKit instead of
- // relying on Pipeline to take care of default values.
scoped_refptr<media::Pipeline> pipeline_;
- bool started_;
// The currently selected key system. Empty string means that no key system
// has been selected.

Powered by Google App Engine
This is Rietveld 408576698