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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2064083002: media: Add Rappor reporting in MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « content/renderer/media/render_media_log_unittest.cc ('k') | media/base/media_log.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2569 matching lines...) Expand 10 before | Expand all | Expand 10 after
2580 sink_id.utf8(), frame_->getSecurityOrigin()); 2580 sink_id.utf8(), frame_->getSecurityOrigin());
2581 // We need to keep a reference to the context provider (see crbug.com/610527) 2581 // We need to keep a reference to the context provider (see crbug.com/610527)
2582 // but media/ can't depend on cc/, so for now, just keep a reference in the 2582 // but media/ can't depend on cc/, so for now, just keep a reference in the
2583 // callback. 2583 // callback.
2584 // TODO(piman): replace media::Context3D to scoped_refptr<ContextProvider> in 2584 // TODO(piman): replace media::Context3D to scoped_refptr<ContextProvider> in
2585 // media/ once ContextProvider is in gpu/. 2585 // media/ once ContextProvider is in gpu/.
2586 media::WebMediaPlayerParams::Context3DCB context_3d_cb = base::Bind( 2586 media::WebMediaPlayerParams::Context3DCB context_3d_cb = base::Bind(
2587 &GetSharedMainThreadContext3D, 2587 &GetSharedMainThreadContext3D,
2588 RenderThreadImpl::current()->SharedMainThreadContextProvider()); 2588 RenderThreadImpl::current()->SharedMainThreadContextProvider());
2589 2589
2590 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog()); 2590 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog(
2591 blink::WebStringToGURL(frame_->getSecurityOrigin().toString())));
2592
2591 #if defined(OS_ANDROID) 2593 #if defined(OS_ANDROID)
2592 if (UseWebMediaPlayerImpl(url) && !media_surface_manager_) 2594 if (UseWebMediaPlayerImpl(url) && !media_surface_manager_)
2593 media_surface_manager_ = new RendererSurfaceViewManager(this); 2595 media_surface_manager_ = new RendererSurfaceViewManager(this);
2594 #endif 2596 #endif
2595 media::WebMediaPlayerParams params( 2597 media::WebMediaPlayerParams params(
2596 base::Bind(&ContentRendererClient::DeferMediaLoad, 2598 base::Bind(&ContentRendererClient::DeferMediaLoad,
2597 base::Unretained(GetContentClient()->renderer()), 2599 base::Unretained(GetContentClient()->renderer()),
2598 static_cast<RenderFrame*>(this), 2600 static_cast<RenderFrame*>(this),
2599 GetWebMediaPlayerDelegate()->has_played_media()), 2601 GetWebMediaPlayerDelegate()->has_played_media()),
2600 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), 2602 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(),
(...skipping 3080 matching lines...) Expand 10 before | Expand all | Expand 10 after
5681 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 5683 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
5682 RenderThreadImpl* const render_thread = RenderThreadImpl::current(); 5684 RenderThreadImpl* const render_thread = RenderThreadImpl::current();
5683 5685
5684 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = 5686 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
5685 render_thread->compositor_task_runner(); 5687 render_thread->compositor_task_runner();
5686 if (!compositor_task_runner.get()) 5688 if (!compositor_task_runner.get())
5687 compositor_task_runner = base::ThreadTaskRunnerHandle::Get(); 5689 compositor_task_runner = base::ThreadTaskRunnerHandle::Get();
5688 5690
5689 return new WebMediaPlayerMS( 5691 return new WebMediaPlayerMS(
5690 frame_, client, GetWebMediaPlayerDelegate()->AsWeakPtr(), 5692 frame_, client, GetWebMediaPlayerDelegate()->AsWeakPtr(),
5691 new RenderMediaLog(), CreateRendererFactory(), compositor_task_runner, 5693 new RenderMediaLog(blink::WebStringToGURL(security_origin.toString())),
5694 CreateRendererFactory(), compositor_task_runner,
5692 render_thread->GetMediaThreadTaskRunner(), 5695 render_thread->GetMediaThreadTaskRunner(),
5693 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories(), 5696 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories(),
5694 sink_id, security_origin); 5697 sink_id, security_origin);
5695 #else 5698 #else
5696 return NULL; 5699 return NULL;
5697 #endif // defined(ENABLE_WEBRTC) 5700 #endif // defined(ENABLE_WEBRTC)
5698 } 5701 }
5699 5702
5700 std::unique_ptr<MediaStreamRendererFactory> 5703 std::unique_ptr<MediaStreamRendererFactory>
5701 RenderFrameImpl::CreateRendererFactory() { 5704 RenderFrameImpl::CreateRendererFactory() {
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
6235 // event target. Potentially a Pepper plugin will receive the event. 6238 // event target. Potentially a Pepper plugin will receive the event.
6236 // In order to tell whether a plugin gets the last mouse event and which it 6239 // In order to tell whether a plugin gets the last mouse event and which it
6237 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6240 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6238 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6241 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6239 // |pepper_last_mouse_event_target_|. 6242 // |pepper_last_mouse_event_target_|.
6240 pepper_last_mouse_event_target_ = nullptr; 6243 pepper_last_mouse_event_target_ = nullptr;
6241 #endif 6244 #endif
6242 } 6245 }
6243 6246
6244 } // namespace content 6247 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/render_media_log_unittest.cc ('k') | media/base/media_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698