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

Unified Diff: content/renderer/render_frame_impl.h

Issue 2712983004: Simplify/Cleanup MediaClient (Closed)
Patch Set: Fix test leak Created 3 years, 8 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
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 4f338df19bd5f4e5ad6b6bdcf7677eff09883bfc..872adbef88f21fcb202fd54b2a34092433e749c5 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -154,6 +154,7 @@ class RenderAccessibilityImpl;
class RendererMediaPlayerManager;
class RendererPpapiHost;
class RenderFrameObserver;
+class RenderMediaLog;
class RenderViewImpl;
class RenderWidget;
class RenderWidgetFullscreenPepper;
@@ -1118,6 +1119,9 @@ class CONTENT_EXPORT RenderFrameImpl
void InitializeBlameContext(RenderFrameImpl* parent_frame);
+ // Lazy constructs a RenderMediaLog for use across owned media objects.
+ const scoped_refptr<RenderMediaLog>& GetMediaLog();
+
// Stores the WebLocalFrame we are associated with. This is null from the
// constructor until BindToWebFrame is called, and it is null after
// frameDetached is called until destruction (which is asynchronous in the
@@ -1238,6 +1242,8 @@ class CONTENT_EXPORT RenderFrameImpl
// Destroyed via the RenderFrameObserver::OnDestruct() mechanism.
UserMediaClientImpl* web_user_media_client_;
+ scoped_refptr<RenderMediaLog> media_log_;
+
// EncryptedMediaClient attached to this frame; lazily initialized.
std::unique_ptr<media::WebEncryptedMediaClientImpl>
web_encrypted_media_client_;
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698