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

Unified Diff: Source/core/html/MediaController.h

Issue 154283004: Move ReadyState enum from MediaControllerInterface to HTMLMediaElement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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: Source/core/html/MediaController.h
diff --git a/Source/core/html/MediaController.h b/Source/core/html/MediaController.h
index 196d419df8182c6e984e836a61e504e9a5ddf82b..9479d250e145e44ce75feacc6cb3fbdf40a7c423 100644
--- a/Source/core/html/MediaController.h
+++ b/Source/core/html/MediaController.h
@@ -29,6 +29,7 @@
#include "bindings/v8/ScriptWrappable.h"
#include "core/events/Event.h"
#include "core/events/EventTarget.h"
+#include "core/html/HTMLMediaElement.h"
#include "core/html/MediaControllerInterface.h"
#include "platform/Timer.h"
#include "wtf/PassRefPtr.h"
@@ -80,7 +81,7 @@ public:
virtual bool muted() const OVERRIDE { return m_muted; }
virtual void setMuted(bool) OVERRIDE;
- virtual ReadyState readyState() const OVERRIDE { return m_readyState; }
+ HTMLMediaElement::ReadyState readyState() const { return m_readyState; }
acolwell GONE FROM CHROMIUM 2014/02/07 21:52:40 Perhaps use "typedef HTMLMediaElement::ReadyState
philipj_slow 2014/02/08 03:52:03 Done.
enum PlaybackState { WAITING, PLAYING, ENDED };
const AtomicString& playbackState() const;
@@ -132,7 +133,7 @@ private:
double m_volume;
mutable double m_position;
bool m_muted;
- ReadyState m_readyState;
+ HTMLMediaElement::ReadyState m_readyState;
PlaybackState m_playbackState;
Vector<RefPtr<Event> > m_pendingEvents;
Timer<MediaController> m_asyncEventTimer;

Powered by Google App Engine
This is Rietveld 408576698