Chromium Code Reviews| Index: blimp/engine/app/blimp_content_renderer_client.cc |
| diff --git a/blimp/engine/app/blimp_content_renderer_client.cc b/blimp/engine/app/blimp_content_renderer_client.cc |
| index 9b9b40a5874dbbc99ed00b7d0b1b08ec9096540a..9e2e44c25dcc4965cb1c768e73df8d78c14f2c9b 100644 |
| --- a/blimp/engine/app/blimp_content_renderer_client.cc |
| +++ b/blimp/engine/app/blimp_content_renderer_client.cc |
| @@ -5,20 +5,34 @@ |
| #include "blimp/engine/app/blimp_content_renderer_client.h" |
| #include "blimp/common/compositor/blimp_image_serialization_processor.h" |
| +#include "blimp/engine/mojo/blob_channel.mojom.h" |
| +#include "blimp/engine/renderer/engine_image_serialization_processor.h" |
| #include "components/web_cache/renderer/web_cache_render_process_observer.h" |
| +#include "content/public/common/service_registry.h" |
| +#include "content/public/renderer/render_thread.h" |
| namespace blimp { |
| namespace engine { |
| - |
| -BlimpContentRendererClient::BlimpContentRendererClient( |
| - scoped_ptr<BlimpImageSerializationProcessor> image_serialization_processor) |
| - : image_serialization_processor_(std::move(image_serialization_processor)) { |
| +namespace { |
| + |
| +BlobChannelMojoPtr GetConnectedBlobChannel() { |
|
nyquist
2016/04/05 22:13:19
Is this call blocking across the renderer and brow
Kevin M
2016/04/06 00:01:44
The renderer: yes (at startup), the browser: no. T
|
| + BlobChannelMojoPtr blob_channel_ptr; |
| + content::RenderThread::Get()->GetServiceRegistry()->ConnectToRemoteService( |
| + mojo::GetProxy(&blob_channel_ptr)); |
| + DCHECK(blob_channel_ptr); |
| + return blob_channel_ptr; |
| } |
| +} // namespace |
| + |
| +BlimpContentRendererClient::BlimpContentRendererClient() {} |
| + |
| BlimpContentRendererClient::~BlimpContentRendererClient() {} |
| void BlimpContentRendererClient::RenderThreadStarted() { |
| web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver()); |
| + image_serialization_processor_.reset( |
| + new EngineImageSerializationProcessor(GetConnectedBlobChannel())); |
| } |
| cc::ImageSerializationProcessor* |