| 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 2505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2516 #if defined(ENABLE_MOJO_RENDERER) | 2516 #if defined(ENABLE_MOJO_RENDERER) |
| 2517 scoped_ptr<media::RendererFactory> media_renderer_factory( | 2517 scoped_ptr<media::RendererFactory> media_renderer_factory( |
| 2518 new media::MojoRendererFactory(GetMediaInterfaceProvider())); | 2518 new media::MojoRendererFactory(GetMediaInterfaceProvider())); |
| 2519 #else | 2519 #else |
| 2520 scoped_ptr<media::RendererFactory> media_renderer_factory = | 2520 scoped_ptr<media::RendererFactory> media_renderer_factory = |
| 2521 GetContentClient()->renderer()->CreateMediaRendererFactory( | 2521 GetContentClient()->renderer()->CreateMediaRendererFactory( |
| 2522 this, render_thread->GetGpuFactories(), media_log); | 2522 this, render_thread->GetGpuFactories(), media_log); |
| 2523 | 2523 |
| 2524 if (!media_renderer_factory.get()) { | 2524 if (!media_renderer_factory.get()) { |
| 2525 media_renderer_factory.reset(new media::DefaultRendererFactory( | 2525 media_renderer_factory.reset(new media::DefaultRendererFactory( |
| 2526 media_log, GetDecoderFactory(), render_thread->GetGpuFactories(), | 2526 media_log, GetDecoderFactory(), |
| 2527 base::Bind(&RenderThreadImpl::GetGpuFactories, |
| 2528 base::Unretained(render_thread)), |
| 2527 *render_thread->GetAudioHardwareConfig())); | 2529 *render_thread->GetAudioHardwareConfig())); |
| 2528 } | 2530 } |
| 2529 #endif // defined(ENABLE_MOJO_RENDERER) | 2531 #endif // defined(ENABLE_MOJO_RENDERER) |
| 2530 | 2532 |
| 2531 if (!url_index_.get() || url_index_->frame() != frame_) | 2533 if (!url_index_.get() || url_index_->frame() != frame_) |
| 2532 url_index_.reset(new media::UrlIndex(frame_)); | 2534 url_index_.reset(new media::UrlIndex(frame_)); |
| 2533 | 2535 |
| 2534 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( | 2536 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
| 2535 frame_, client, encrypted_client, | 2537 frame_, client, encrypted_client, |
| 2536 GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2538 GetWebMediaPlayerDelegate()->AsWeakPtr(), |
| (...skipping 3596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6133 int match_count, | 6135 int match_count, |
| 6134 int ordinal, | 6136 int ordinal, |
| 6135 const WebRect& selection_rect, | 6137 const WebRect& selection_rect, |
| 6136 bool final_status_update) { | 6138 bool final_status_update) { |
| 6137 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6139 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6138 selection_rect, ordinal, | 6140 selection_rect, ordinal, |
| 6139 final_status_update)); | 6141 final_status_update)); |
| 6140 } | 6142 } |
| 6141 | 6143 |
| 6142 } // namespace content | 6144 } // namespace content |
| OLD | NEW |