Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Unified Diff: webkit/support/test_media_stream_client.h

Issue 10918052: create a separate WebMediaPlayer for URL derived from media stream (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix win build Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/support/test_media_stream_client.h
===================================================================
--- webkit/support/test_media_stream_client.h (revision 154837)
+++ webkit/support/test_media_stream_client.h (working copy)
@@ -9,28 +9,24 @@
#ifndef WEBKIT_SUPPORT_TEST_MEDIA_STREAM_CLIENT_H_
#define WEBKIT_SUPPORT_TEST_MEDIA_STREAM_CLIENT_H_
+#include "base/callback.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
#include "webkit/media/media_stream_client.h"
+#include "webkit/media/video_frame_provider.h"
scherkus (not reviewing) 2012/09/07 11:44:03 media_stream_client.h handles this #include for yo
wjia(left Chromium) 2012/09/13 01:22:07 Done.
namespace webkit_support {
-// TODO(tommyw): Remove deprecated class after corresponding
-// WebKit patch is committed.
-class MediaStreamUtil {
- public:
- virtual bool IsMockStream(const WebKit::WebURL& url) = 0;
-};
-
class TestMediaStreamClient : public webkit_media::MediaStreamClient {
public:
- // TODO(tommyw): Remove deprecated constructor after
- // corresponding WebKit patch is committed.
- explicit TestMediaStreamClient(MediaStreamUtil* media_stream_util) {}
+ TestMediaStreamClient();
+ virtual ~TestMediaStreamClient();
- TestMediaStreamClient() {}
- virtual ~TestMediaStreamClient() {}
-
// Implement webkit_media::MediaStreamClient.
+ virtual bool IsMediaStream(const GURL& url) OVERRIDE;
+ virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider(
+ const GURL& url,
+ const base::Closure& error_cb,
+ const webkit_media::RepaintCB& repaint_cb) OVERRIDE;
virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
const GURL& url,
media::MessageLoopFactory* message_loop_factory) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698