WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/html/HTMLMediaElement.h

Index: third_party/WebKit/WebCore/html/HTMLMediaElement.h
===================================================================
--- third_party/WebKit/WebCore/html/HTMLMediaElement.h	(revision 11154)
+++ third_party/WebKit/WebCore/html/HTMLMediaElement.h	(working copy)
@@ -83,7 +83,6 @@
     
     enum NetworkState { EMPTY, LOADING, LOADED_METADATA, LOADED_FIRST_FRAME, LOADED };
     NetworkState networkState() const;
-    float bufferingRate();
     PassRefPtr<TimeRanges> buffered() const;
     void load(ExceptionCode&);
     
@@ -108,23 +107,11 @@
     bool ended() const;
     bool autoplay() const;    
     void setAutoplay(bool b);
+    bool loop() const;    
+    void setLoop(bool b);
     void play(ExceptionCode&);
     void pause(ExceptionCode&);
     
-// looping
-    float start() const;
-    void setStart(float time);
-    float end() const;
-    void setEnd(float time);
-    float loopStart() const;
-    void setLoopStart(float time);
-    float loopEnd() const;
-    void setLoopEnd(float time);
-    unsigned playCount() const;
-    void setPlayCount(unsigned, ExceptionCode&);
-    unsigned currentLoop() const;
-    void setCurrentLoop(unsigned);
-
 // controls
     bool controls() const;
     void setControls(bool);
@@ -188,10 +175,6 @@
     String selectMediaURL(ContentType& contentType);
     void updateVolume();
     void updatePlayState();
-    float effectiveStart() const;
-    float effectiveEnd() const;
-    float effectiveLoopStart() const;
-    float effectiveLoopEnd() const;
     bool activelyPlaying() const;
     bool endedPlayback() const;
 
@@ -235,8 +218,6 @@
     double m_previousProgressTime;
     bool m_sentStalledEvent;
     
-    float m_bufferingRate;
-    
     unsigned m_loadNestingLevel;
     unsigned m_terminateLoadBelowNestingLevel;