WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/html/HTMLMediaElement.h

 /*
  * Copyright (C) 2007, 2008, 2009 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 65 matching lines @@
 // error state
     PassRefPtr<MediaError> error() const;
 
 // network state
     KURL src() const;
     void setSrc(const String&);
     String currentSrc() const;
     
     enum NetworkState { EMPTY, LOADING, LOADED_METADATA, LOADED_FIRST_FRAME, LOADED };
     NetworkState networkState() const;
-    float bufferingRate();
     PassRefPtr<TimeRanges> buffered() const;
     void load(ExceptionCode&);
     
     String canPlayType(const String& mimeType) const;
 
 // ready state
     enum ReadyState { DATA_UNAVAILABLE, CAN_SHOW_CURRENT_FRAME, CAN_PLAY, CAN_PLAY_THROUGH };
     ReadyState readyState() const;
     bool seeking() const;
 
 // playback state
     float currentTime() const;
     void setCurrentTime(float, ExceptionCode&);
     float duration() const;
     bool paused() const;
     float defaultPlaybackRate() const;
     void setDefaultPlaybackRate(float, ExceptionCode&);
     float playbackRate() const;
     void setPlaybackRate(float, ExceptionCode&);
     PassRefPtr<TimeRanges> played() const;
     PassRefPtr<TimeRanges> seekable() const;
     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);
     float volume() const;
     void setVolume(float, ExceptionCode&);
     bool muted() const;
     void setMuted(bool);
     void togglePlayState(ExceptionCode& ec);
     void beginScrubbing();
     void endScrubbing();
@@ skipping 43 matching lines @@
     void pauseInternal(ExceptionCode& ec);
     
     bool processingUserGesture() const;
     bool processingMediaPlayerCallback() const { return m_processingMediaPlayerCallback > 0; }
     void beginProcessingMediaPlayerCallback() { ++m_processingMediaPlayerCallback; }
     void endProcessingMediaPlayerCallback() { ASSERT(m_processingMediaPlayerCallback); --m_processingMediaPlayerCallback; }
 
     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;
 
     // Restrictions to change default behaviors. This is a effectively a compile time choice at the moment
     //  because there are no accessor methods.
     enum BehaviorRestrictions 
     { 
         NoRestrictions = 0,
         RequireUserGestureForLoadRestriction = 1 << 0,
         RequireUserGestureForRateChangeRestriction = 1 << 1,
@@ skipping 23 matching lines @@
     
     bool m_paused;
     bool m_seeking;
     
     float m_currentTimeDuringSeek;
     
     unsigned m_previousProgress;
     double m_previousProgressTime;
     bool m_sentStalledEvent;
     
-    float m_bufferingRate;
-    
     unsigned m_loadNestingLevel;
     unsigned m_terminateLoadBelowNestingLevel;
     
     bool m_pausedInternal;
     bool m_inActiveDocument;
 
     OwnPtr<MediaPlayer> m_player;
 
     BehaviorRestrictions m_restrictions;
 
     // counter incremented while processing a callback from the media player, so we can avoid
     //  calling the media engine recursively
     int m_processingMediaPlayerCallback;
 
     // Not all media engines provide enough information about a file to be able to
     // support progress events so setting m_sendProgressEvents disables them 
     bool m_sendProgressEvents;
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     bool m_needWidgetUpdate;
 #endif
 };
 
 } //namespace
 
 #endif
 #endif