Move ReadyState enum from MediaControllerInterface to HTMLMediaElement

Source/core/html/MediaController.h

 /*
  * Copyright (C) 2011 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef MediaController_h
 #define MediaController_h
 
 #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"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class Clock;
 class Event;
@@ skipping 31 matching lines @@
 
     virtual double playbackRate() const OVERRIDE;
     virtual void setPlaybackRate(double) OVERRIDE;
 
     virtual double volume() const OVERRIDE { return m_volume; }
     virtual void setVolume(double, ExceptionState&) OVERRIDE;
 
     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 ReadyState;" here so we don't
have to explicitly call out HTMLMediaElement everywhere?

[philipj_slow, 2014/02/08 03:52:03]

Done.

 
     enum PlaybackState { WAITING, PLAYING, ENDED };
     const AtomicString& playbackState() const;
 
     virtual bool isFullscreen() const OVERRIDE { return false; }
     virtual void enterFullscreen() OVERRIDE { }
 
     virtual bool hasAudio() const OVERRIDE;
     virtual bool hasVideo() const OVERRIDE;
     virtual bool hasClosedCaptions() const OVERRIDE;
@@ skipping 31 matching lines @@
     virtual ExecutionContext* executionContext() const OVERRIDE { return m_executionContext; }
 
     friend class HTMLMediaElement;
     friend class MediaControllerEventListener;
     Vector<HTMLMediaElement*> m_mediaElements;
     bool m_paused;
     double m_defaultPlaybackRate;
     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;
     mutable Timer<MediaController> m_clearPositionTimer;
     String m_mediaGroup;
     bool m_closedCaptionsVisible;
     OwnPtr<Clock> m_clock;
     ExecutionContext* m_executionContext;
     Timer<MediaController> m_timeupdateTimer;
     double m_previousTimeupdateTime;
 };
 
 } // namespace WebCore
 
 #endif