OLD | NEW |
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 2447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2458 | 2458 |
2459 #if defined(OS_ANDROID) | 2459 #if defined(OS_ANDROID) |
2460 if (GetContentClient()->renderer()->ShouldUseMediaPlayerForURL(url) || | 2460 if (GetContentClient()->renderer()->ShouldUseMediaPlayerForURL(url) || |
2461 !UseWebMediaPlayerImpl(url)) { | 2461 !UseWebMediaPlayerImpl(url)) { |
2462 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); | 2462 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); |
2463 } | 2463 } |
2464 #endif // defined(OS_ANDROID) | 2464 #endif // defined(OS_ANDROID) |
2465 | 2465 |
2466 #if defined(ENABLE_MOJO_RENDERER) | 2466 #if defined(ENABLE_MOJO_RENDERER) |
2467 scoped_ptr<media::RendererFactory> media_renderer_factory( | 2467 scoped_ptr<media::RendererFactory> media_renderer_factory( |
2468 new media::MojoRendererFactory(GetMediaInterfaceProvider())); | 2468 new media::MojoRendererFactory(render_thread->GetGpuFactories(), |
| 2469 GetMediaInterfaceProvider())); |
2469 #else | 2470 #else |
2470 scoped_ptr<media::RendererFactory> media_renderer_factory = | 2471 scoped_ptr<media::RendererFactory> media_renderer_factory = |
2471 GetContentClient()->renderer()->CreateMediaRendererFactory( | 2472 GetContentClient()->renderer()->CreateMediaRendererFactory( |
2472 this, render_thread->GetGpuFactories(), media_log); | 2473 this, render_thread->GetGpuFactories(), media_log); |
2473 | 2474 |
2474 if (!media_renderer_factory.get()) { | 2475 if (!media_renderer_factory.get()) { |
2475 media_renderer_factory.reset(new media::DefaultRendererFactory( | 2476 media_renderer_factory.reset(new media::DefaultRendererFactory( |
2476 media_log, GetDecoderFactory(), | 2477 media_log, GetDecoderFactory(), |
2477 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2478 base::Bind(&RenderThreadImpl::GetGpuFactories, |
2478 base::Unretained(render_thread)), | 2479 base::Unretained(render_thread)), |
(...skipping 3545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6024 int match_count, | 6025 int match_count, |
6025 int ordinal, | 6026 int ordinal, |
6026 const WebRect& selection_rect, | 6027 const WebRect& selection_rect, |
6027 bool final_status_update) { | 6028 bool final_status_update) { |
6028 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6029 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6029 selection_rect, ordinal, | 6030 selection_rect, ordinal, |
6030 final_status_update)); | 6031 final_status_update)); |
6031 } | 6032 } |
6032 | 6033 |
6033 } // namespace content | 6034 } // namespace content |
OLD | NEW |