| 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 2425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2436 static_cast<RenderFrame*>(this), | 2436 static_cast<RenderFrame*>(this), |
| 2437 GetWebMediaPlayerDelegate()->has_played_media()), | 2437 GetWebMediaPlayerDelegate()->has_played_media()), |
| 2438 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), | 2438 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), |
| 2439 render_thread->GetWorkerTaskRunner(), | 2439 render_thread->GetWorkerTaskRunner(), |
| 2440 render_thread->compositor_task_runner(), context_3d_cb, | 2440 render_thread->compositor_task_runner(), context_3d_cb, |
| 2441 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, | 2441 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, |
| 2442 base::Unretained(blink::mainThreadIsolate())), | 2442 base::Unretained(blink::mainThreadIsolate())), |
| 2443 initial_cdm, media_surface_manager_, media_session); | 2443 initial_cdm, media_surface_manager_, media_session); |
| 2444 | 2444 |
| 2445 #if defined(OS_ANDROID) | 2445 #if defined(OS_ANDROID) |
| 2446 if (!UseWebMediaPlayerImpl(url)) | 2446 if (GetContentClient()->renderer()->ShouldUseMediaPlayerForURL(url) || |
| 2447 !UseWebMediaPlayerImpl(url)) { |
| 2447 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); | 2448 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); |
| 2449 } |
| 2448 #endif // defined(OS_ANDROID) | 2450 #endif // defined(OS_ANDROID) |
| 2449 | 2451 |
| 2450 #if defined(ENABLE_MOJO_RENDERER) | 2452 #if defined(ENABLE_MOJO_RENDERER) |
| 2451 scoped_ptr<media::RendererFactory> media_renderer_factory( | 2453 scoped_ptr<media::RendererFactory> media_renderer_factory( |
| 2452 new media::MojoRendererFactory(GetMediaInterfaceProvider())); | 2454 new media::MojoRendererFactory(GetMediaInterfaceProvider())); |
| 2453 #else | 2455 #else |
| 2454 scoped_ptr<media::RendererFactory> media_renderer_factory = | 2456 scoped_ptr<media::RendererFactory> media_renderer_factory = |
| 2455 GetContentClient()->renderer()->CreateMediaRendererFactory( | 2457 GetContentClient()->renderer()->CreateMediaRendererFactory( |
| 2456 this, render_thread->GetGpuFactories(), media_log); | 2458 this, render_thread->GetGpuFactories(), media_log); |
| 2457 | 2459 |
| (...skipping 3553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6011 int match_count, | 6013 int match_count, |
| 6012 int ordinal, | 6014 int ordinal, |
| 6013 const WebRect& selection_rect, | 6015 const WebRect& selection_rect, |
| 6014 bool final_status_update) { | 6016 bool final_status_update) { |
| 6015 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6017 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6016 selection_rect, ordinal, | 6018 selection_rect, ordinal, |
| 6017 final_status_update)); | 6019 final_status_update)); |
| 6018 } | 6020 } |
| 6019 | 6021 |
| 6020 } // namespace content | 6022 } // namespace content |
| OLD | NEW |