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

Unified Diff: content/renderer/media/webmediaplayer_ms.h

Issue 1417533006: Unit test for WebMediaPlayerMS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Style Created 5 years, 1 month 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: content/renderer/media/webmediaplayer_ms.h
diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
index 762daaad07ab6b48a9711f70b5e9f798c73ed034..55db90a65b9b18a287f7ac1b9aed41acea77ba9b 100644
--- a/content/renderer/media/webmediaplayer_ms.h
+++ b/content/renderer/media/webmediaplayer_ms.h
@@ -11,6 +11,7 @@
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
+#include "content/common/content_export.h"
#include "media/blink/webmediaplayer_util.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
#include "media/renderers/skcanvas_video_renderer.h"
@@ -58,9 +59,9 @@ class WebMediaPlayerMSCompositor;
//
// blink::WebMediaPlayerClient
// WebKit client of this media player object.
-class WebMediaPlayerMS
- : public blink::WebMediaPlayer,
- public base::SupportsWeakPtr<WebMediaPlayerMS> {
+class CONTENT_EXPORT WebMediaPlayerMS
+ : public NON_EXPORTED_BASE(blink::WebMediaPlayer),
+ public NON_EXPORTED_BASE(base::SupportsWeakPtr<WebMediaPlayerMS>) {
public:
// Construct a WebMediaPlayerMS with reference to the client, and
// a MediaStreamClient which provides VideoFrameProvider.
@@ -143,6 +144,8 @@ class WebMediaPlayerMS
bool flip_y) override;
private:
+ friend class WebMediaPlayerMSTest;
+
// The callback for VideoFrameProvider to signal a new frame is available.
void OnFrameAvailable(const scoped_refptr<media::VideoFrame>& frame);
// Need repaint due to state change.

Powered by Google App Engine
This is Rietveld 408576698