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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2135 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) | 2135 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
2136 | 2136 |
2137 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog()); | 2137 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog()); |
2138 media::WebMediaPlayerParams params( | 2138 media::WebMediaPlayerParams params( |
2139 base::Bind(&ContentRendererClient::DeferMediaLoad, | 2139 base::Bind(&ContentRendererClient::DeferMediaLoad, |
2140 base::Unretained(GetContentClient()->renderer()), | 2140 base::Unretained(GetContentClient()->renderer()), |
2141 static_cast<RenderFrame*>(this), has_played_media_), | 2141 static_cast<RenderFrame*>(this), has_played_media_), |
2142 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), | 2142 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), |
2143 render_thread->GetWorkerTaskRunner(), | 2143 render_thread->GetWorkerTaskRunner(), |
2144 render_thread->compositor_task_runner(), context_3d_cb, | 2144 render_thread->compositor_task_runner(), context_3d_cb, |
2145 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, | |
2146 base::Unretained(blink::mainThreadIsolate())), | |
jochen (gone - plz use gerrit)
2015/10/28 14:41:26
btw, it's important that you invoke this callback
haraken
2015/10/28 14:45:36
mainThreadIsolate() has ASSERT(isMainThread()).
O
DaleCurtis
2015/10/28 17:56:01
Yup, main thread callbacks only. WMPI includes a D
| |
2145 GetMediaPermission(), initial_cdm); | 2147 GetMediaPermission(), initial_cdm); |
2146 | 2148 |
2147 // TODO(xhwang, watk): Find a better way to specify these ifdef conditions. | 2149 // TODO(xhwang, watk): Find a better way to specify these ifdef conditions. |
2148 #if defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) | 2150 #if defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
2149 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); | 2151 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); |
2150 #else | 2152 #else |
2151 #if defined(ENABLE_MOJO_MEDIA) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) | 2153 #if defined(ENABLE_MOJO_MEDIA) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
2152 scoped_ptr<media::RendererFactory> media_renderer_factory( | 2154 scoped_ptr<media::RendererFactory> media_renderer_factory( |
2153 new media::MojoRendererFactory(GetMediaServiceFactory())); | 2155 new media::MojoRendererFactory(GetMediaServiceFactory())); |
2154 #else | 2156 #else |
(...skipping 3106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5261 mojo::ServiceProviderPtr service_provider; | 5263 mojo::ServiceProviderPtr service_provider; |
5262 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5264 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5263 request->url = mojo::String::From(url); | 5265 request->url = mojo::String::From(url); |
5264 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5266 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5265 nullptr, nullptr, | 5267 nullptr, nullptr, |
5266 base::Bind(&OnGotContentHandlerID)); | 5268 base::Bind(&OnGotContentHandlerID)); |
5267 return service_provider.Pass(); | 5269 return service_provider.Pass(); |
5268 } | 5270 } |
5269 | 5271 |
5270 } // namespace content | 5272 } // namespace content |
OLD | NEW |