Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / webmediaplayer_ms.h

diff --git a/src/content/renderer/media/webmediaplayer_ms.h b/src/content/renderer/media/webmediaplayer_ms.h
index eb67d3d..3866777 100644 (file)
--- a/src/content/renderer/media/webmediaplayer_ms.h
+++ b/src/content/renderer/media/webmediaplayer_ms.h
@@ -76,17 +76,13 @@ class WebMediaPlayerMS
   virtual void setVolume(double volume);
   virtual void setPreload(blink::WebMediaPlayer::Preload preload);
   virtual blink::WebTimeRanges buffered() const;
-  virtual double maxTimeSeekable() const;
+  virtual blink::WebTimeRanges seekable() const;
 
   // Methods for painting.
   virtual void paint(blink::WebCanvas* canvas,
                      const blink::WebRect& rect,
                      unsigned char alpha,
                      SkXfermode::Mode mode);
-  // TODO(dshwang): remove it because above method replaces. crbug.com/401027
-  virtual void paint(blink::WebCanvas* canvas,
-                     const blink::WebRect& rect,
-                     unsigned char alpha);
 
   // True if the loaded media has a playable video/audio track.
   virtual bool hasVideo() const;
@@ -118,11 +114,10 @@ class WebMediaPlayerMS
   virtual unsigned videoDecodedByteCount() const;
 
   // VideoFrameProvider implementation.
-  virtual void SetVideoFrameProviderClient(
-      cc::VideoFrameProvider::Client* client) OVERRIDE;
-  virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() OVERRIDE;
-  virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame)
-      OVERRIDE;
+  void SetVideoFrameProviderClient(
+      cc::VideoFrameProvider::Client* client) override;
+  scoped_refptr<media::VideoFrame> GetCurrentFrame() override;
+  void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) override;
 
  private:
   // The callback for VideoFrameProvider to signal a new frame is available.