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

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: Kill Memory Leak Created 5 years 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
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediaplayer_ms.h
diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
index d0d2fb365acc35a6665dc086c3131c9fa3693742..bfeaff49e13e538d9a2440b8738d2ccb4ef8722c 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 "content/public/renderer/render_frame_observer.h"
#include "media/blink/webmediaplayer_util.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
@@ -56,10 +57,10 @@ class RenderFrameObserver;
//
// blink::WebMediaPlayerClient
// WebKit client of this media player object.
-class WebMediaPlayerMS
- : public blink::WebMediaPlayer,
- public base::SupportsWeakPtr<WebMediaPlayerMS>,
- public RenderFrameObserver {
+class CONTENT_EXPORT WebMediaPlayerMS
+ : public NON_EXPORTED_BASE(blink::WebMediaPlayer),
+ public NON_EXPORTED_BASE(base::SupportsWeakPtr<WebMediaPlayerMS>),
+ public NON_EXPORTED_BASE(RenderFrameObserver) {
public:
// Construct a WebMediaPlayerMS with reference to the client, and
// a MediaStreamClient which provides VideoFrameProvider.
@@ -147,6 +148,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.
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698