| 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 media::WebMediaPlayerParams params( | 2458 media::WebMediaPlayerParams params( |
| 2459 base::Bind(&ContentRendererClient::DeferMediaLoad, | 2459 base::Bind(&ContentRendererClient::DeferMediaLoad, |
| 2460 base::Unretained(GetContentClient()->renderer()), | 2460 base::Unretained(GetContentClient()->renderer()), |
| 2461 static_cast<RenderFrame*>(this), | 2461 static_cast<RenderFrame*>(this), |
| 2462 GetWebMediaPlayerDelegate()->has_played_media()), | 2462 GetWebMediaPlayerDelegate()->has_played_media()), |
| 2463 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), | 2463 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), |
| 2464 render_thread->GetWorkerTaskRunner(), | 2464 render_thread->GetWorkerTaskRunner(), |
| 2465 render_thread->compositor_task_runner(), context_3d_cb, | 2465 render_thread->compositor_task_runner(), context_3d_cb, |
| 2466 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, | 2466 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, |
| 2467 base::Unretained(blink::mainThreadIsolate())), | 2467 base::Unretained(blink::mainThreadIsolate())), |
| 2468 initial_cdm, media_surface_manager_, media_session); | 2468 initial_cdm, media_surface_manager_, media_session, |
| 2469 GetContentClient()->renderer()->AllowMediaIdleSuspend()); |
| 2469 | 2470 |
| 2470 #if defined(OS_ANDROID) | 2471 #if defined(OS_ANDROID) |
| 2471 if (!UseWebMediaPlayerImpl(url)) { | 2472 if (!UseWebMediaPlayerImpl(url)) { |
| 2472 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); | 2473 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); |
| 2473 } | 2474 } |
| 2474 #endif // defined(OS_ANDROID) | 2475 #endif // defined(OS_ANDROID) |
| 2475 | 2476 |
| 2476 #if defined(ENABLE_MOJO_RENDERER) | 2477 #if defined(ENABLE_MOJO_RENDERER) |
| 2477 std::unique_ptr<media::RendererFactory> media_renderer_factory( | 2478 std::unique_ptr<media::RendererFactory> media_renderer_factory( |
| 2478 new media::MojoRendererFactory(GetMediaInterfaceProvider())); | 2479 new media::MojoRendererFactory(GetMediaInterfaceProvider())); |
| (...skipping 3541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6020 int match_count, | 6021 int match_count, |
| 6021 int ordinal, | 6022 int ordinal, |
| 6022 const WebRect& selection_rect, | 6023 const WebRect& selection_rect, |
| 6023 bool final_status_update) { | 6024 bool final_status_update) { |
| 6024 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6025 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6025 selection_rect, ordinal, | 6026 selection_rect, ordinal, |
| 6026 final_status_update)); | 6027 final_status_update)); |
| 6027 } | 6028 } |
| 6028 | 6029 |
| 6029 } // namespace content | 6030 } // namespace content |
| OLD | NEW |