| 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 2500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2511 media::WebMediaPlayerParams params( | 2511 media::WebMediaPlayerParams params( |
| 2512 base::Bind(&ContentRendererClient::DeferMediaLoad, | 2512 base::Bind(&ContentRendererClient::DeferMediaLoad, |
| 2513 base::Unretained(GetContentClient()->renderer()), | 2513 base::Unretained(GetContentClient()->renderer()), |
| 2514 static_cast<RenderFrame*>(this), | 2514 static_cast<RenderFrame*>(this), |
| 2515 GetWebMediaPlayerDelegate()->has_played_media()), | 2515 GetWebMediaPlayerDelegate()->has_played_media()), |
| 2516 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), | 2516 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), |
| 2517 render_thread->GetWorkerTaskRunner(), | 2517 render_thread->GetWorkerTaskRunner(), |
| 2518 render_thread->compositor_task_runner(), context_3d_cb, | 2518 render_thread->compositor_task_runner(), context_3d_cb, |
| 2519 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, | 2519 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, |
| 2520 base::Unretained(blink::mainThreadIsolate())), | 2520 base::Unretained(blink::mainThreadIsolate())), |
| 2521 initial_cdm, media_surface_manager_, media_session); | 2521 initial_cdm, media_surface_manager_, media_session, |
| 2522 GetContentClient()->renderer()->AllowMediaIdleSuspend()); |
| 2522 | 2523 |
| 2523 #if defined(OS_ANDROID) | 2524 #if defined(OS_ANDROID) |
| 2524 if (!UseWebMediaPlayerImpl(url)) { | 2525 if (!UseWebMediaPlayerImpl(url)) { |
| 2525 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); | 2526 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); |
| 2526 } | 2527 } |
| 2527 #endif // defined(OS_ANDROID) | 2528 #endif // defined(OS_ANDROID) |
| 2528 | 2529 |
| 2529 #if defined(ENABLE_MOJO_RENDERER) | 2530 #if defined(ENABLE_MOJO_RENDERER) |
| 2530 std::unique_ptr<media::RendererFactory> media_renderer_factory( | 2531 std::unique_ptr<media::RendererFactory> media_renderer_factory( |
| 2531 new media::MojoRendererFactory(GetMediaInterfaceProvider())); | 2532 new media::MojoRendererFactory(GetMediaInterfaceProvider())); |
| (...skipping 3612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6144 // event target. Potentially a Pepper plugin will receive the event. | 6145 // event target. Potentially a Pepper plugin will receive the event. |
| 6145 // In order to tell whether a plugin gets the last mouse event and which it | 6146 // In order to tell whether a plugin gets the last mouse event and which it |
| 6146 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6147 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6147 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6148 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6148 // |pepper_last_mouse_event_target_|. | 6149 // |pepper_last_mouse_event_target_|. |
| 6149 pepper_last_mouse_event_target_ = nullptr; | 6150 pepper_last_mouse_event_target_ = nullptr; |
| 6150 #endif | 6151 #endif |
| 6151 } | 6152 } |
| 6152 | 6153 |
| 6153 } // namespace content | 6154 } // namespace content |
| OLD | NEW |