webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 39 insertions, 35 deletions

diff --git a/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h b/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h
index cd8d794ab..d03e4a06e 100644
--- a/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h
+++ b/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -38,59 +38,63 @@ class MockMediaSourcePrivate;
 
 class MockMediaPlayerMediaSource : public MediaPlayerPrivateInterface {
 public:
+    explicit MockMediaPlayerMediaSource(MediaPlayer*);
+
     // MediaPlayer Engine Support
-    static void registerMediaEngine(MediaEngineRegistrar);
-    static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
-    static void getSupportedTypes(HashSet<String>& types);
+    WEBCORE_EXPORT static void registerMediaEngine(MediaEngineRegistrar);
+    static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types);
     static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
 
     virtual ~MockMediaPlayerMediaSource();
 
     void advanceCurrentTime();
-    void updateDuration(double);
+    void updateDuration(const MediaTime&);
 
-    virtual MediaPlayer::ReadyState readyState() const override;
+    MediaPlayer::ReadyState readyState() const override;
     void setReadyState(MediaPlayer::ReadyState);
     void setNetworkState(MediaPlayer::NetworkState);
+    void waitForSeekCompleted();
+    void seekCompleted();
 
 private:
-    MockMediaPlayerMediaSource(MediaPlayer*);
-
     // MediaPlayerPrivate Overrides
-    virtual void load(const String& url) override;
-    virtual void load(const String& url, PassRefPtr<HTMLMediaSource>) override;
-    virtual void cancelLoad() override;
-    virtual void play() override;
-    virtual void pause() override;
-    virtual IntSize naturalSize() const override;
-    virtual bool hasVideo() const override;
-    virtual bool hasAudio() const override;
-    virtual void setVisible(bool) override;
-    virtual bool seeking() const override;
-    virtual bool paused() const override;
-    virtual MediaPlayer::NetworkState networkState() const override;
-    virtual double maxTimeSeekableDouble() const override;
-    virtual PassRefPtr<TimeRanges> buffered() const override;
-    virtual bool didLoadingProgress() const override;
-    virtual void setSize(const IntSize&) override;
-    virtual void paint(GraphicsContext*, const IntRect&) override;
-    virtual double currentTimeDouble() const override;
-    virtual double durationDouble() const override;
-    virtual void seekWithTolerance(double time, double, double) override;
-    virtual unsigned long totalVideoFrames() override;
-    virtual unsigned long droppedVideoFrames() override;
-    virtual unsigned long corruptedVideoFrames() override;
-    virtual double totalFrameDelay() override;
+    void load(const String& url) override;
+    void load(const String& url, MediaSourcePrivateClient*) override;
+#if ENABLE(MEDIA_STREAM)
+    void load(MediaStreamPrivate&) override { }
+#endif
+    void cancelLoad() override;
+    void play() override;
+    void pause() override;
+    FloatSize naturalSize() const override;
+    bool hasVideo() const override;
+    bool hasAudio() const override;
+    void setVisible(bool) override;
+    bool seeking() const override;
+    bool paused() const override;
+    MediaPlayer::NetworkState networkState() const override;
+    MediaTime maxMediaTimeSeekable() const override;
+    std::unique_ptr<PlatformTimeRanges> buffered() const override;
+    bool didLoadingProgress() const override;
+    void setSize(const IntSize&) override;
+    void paint(GraphicsContext&, const FloatRect&) override;
+    MediaTime currentMediaTime() const override;
+    MediaTime durationMediaTime() const override;
+    void seekWithTolerance(const MediaTime&, const MediaTime&, const MediaTime&) override;
+    unsigned long totalVideoFrames() override;
+    unsigned long droppedVideoFrames() override;
+    unsigned long corruptedVideoFrames() override;
+    MediaTime totalFrameDelay() override;
 
     MediaPlayer* m_player;
-    RefPtr<HTMLMediaSource> m_mediaSource;
     RefPtr<MockMediaSourcePrivate> m_mediaSourcePrivate;
 
     MediaTime m_currentTime;
-    double m_duration;
+    MediaTime m_duration;
     MediaPlayer::ReadyState m_readyState;
     MediaPlayer::NetworkState m_networkState;
     bool m_playing;
+    bool m_seekCompleted;
 };
 
 }