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 5073 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5084 } else { | 5084 } else { |
5085 GpuChannelHost* gpu_channel_host = | 5085 GpuChannelHost* gpu_channel_host = |
5086 RenderThreadImpl::current()->EstablishGpuChannelSync( | 5086 RenderThreadImpl::current()->EstablishGpuChannelSync( |
5087 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | 5087 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
5088 | 5088 |
5089 if (!gpu_channel_host) { | 5089 if (!gpu_channel_host) { |
5090 LOG(ERROR) << "Failed to establish GPU channel for media player"; | 5090 LOG(ERROR) << "Failed to establish GPU channel for media player"; |
5091 return NULL; | 5091 return NULL; |
5092 } | 5092 } |
5093 | 5093 |
5094 scoped_refptr<cc_blink::ContextProviderWebContext> context_provider = | 5094 ContextProviderCommandBuffer* ptr = reinterpret_cast< |
no sievers
2015/10/26 21:35:33
We should avoid this cast. One way would be by hav
sivag
2015/10/27 15:42:44
untangle and make
| |
5095 RenderThreadImpl::current()->SharedMainThreadContextProvider(); | 5095 ContextProviderCommandBuffer*>( |
5096 RenderThreadImpl::current()->SharedMainThreadContextProvider().get()); | |
5097 scoped_refptr<ContextProviderCommandBuffer> context_provider(ptr); | |
5096 | 5098 |
5097 if (!context_provider.get()) { | 5099 if (!context_provider.get()) { |
5098 LOG(ERROR) << "Failed to get context3d for media player"; | 5100 LOG(ERROR) << "Failed to get context3d for media player"; |
5099 return NULL; | 5101 return NULL; |
5100 } | 5102 } |
5101 | 5103 |
5102 stream_texture_factory = StreamTextureFactoryImpl::Create( | 5104 stream_texture_factory = StreamTextureFactoryImpl::Create( |
5103 context_provider, gpu_channel_host, routing_id_); | 5105 context_provider, gpu_channel_host, routing_id_); |
5104 } | 5106 } |
5105 | 5107 |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5201 mojo::ServiceProviderPtr service_provider; | 5203 mojo::ServiceProviderPtr service_provider; |
5202 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5204 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5203 request->url = mojo::String::From(url); | 5205 request->url = mojo::String::From(url); |
5204 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5206 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5205 nullptr, nullptr, | 5207 nullptr, nullptr, |
5206 base::Bind(&OnGotContentHandlerID)); | 5208 base::Bind(&OnGotContentHandlerID)); |
5207 return service_provider.Pass(); | 5209 return service_provider.Pass(); |
5208 } | 5210 } |
5209 | 5211 |
5210 } // namespace content | 5212 } // namespace content |
OLD | NEW |