Incorporate BlobChannel into Blimp image encode/decode pipeline.

blimp/engine/session/blimp_engine_session.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/engine/session/blimp_engine_session.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
+#include "blimp/common/blob_cache/in_memory_blob_cache.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/tab_control.pb.h"
 #include "blimp/engine/app/blimp_engine_config.h"
 #include "blimp/engine/app/settings_manager.h"
 #include "blimp/engine/app/switches.h"
 #include "blimp/engine/app/ui/blimp_layout_manager.h"
 #include "blimp/engine/app/ui/blimp_screen.h"
 #include "blimp/engine/app/ui/blimp_window_tree_client.h"
 #include "blimp/engine/app/ui/blimp_window_tree_host.h"
 #include "blimp/engine/common/blimp_browser_context.h"
 #include "blimp/net/blimp_connection.h"
 #include "blimp/net/blimp_message_multiplexer.h"
 #include "blimp/net/blimp_message_thread_pipe.h"
+#include "blimp/net/blob_channel/blob_channel_sender.h"
+#include "blimp/net/blob_channel/helium_blob_sender_delegate.h"
 #include "blimp/net/browser_connection_handler.h"
 #include "blimp/net/common.h"
 #include "blimp/net/engine_authentication_handler.h"
 #include "blimp/net/engine_connection_manager.h"
 #include "blimp/net/null_blimp_message_processor.h"
 #include "blimp/net/tcp_engine_transport.h"
 #include "blimp/net/thread_pipe_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 168 matching lines @@
     std::unique_ptr<BlimpBrowserContext> browser_context,
     net::NetLog* net_log,
     BlimpEngineConfig* engine_config,
     SettingsManager* settings_manager)
     : browser_context_(std::move(browser_context)),
       engine_config_(engine_config),
       screen_(new BlimpScreen),
       settings_manager_(settings_manager),
       settings_feature_(settings_manager_),
       render_widget_feature_(settings_manager_),
+      blob_delegate_(new HeliumBlobSenderDelegate),
+      blob_sender_(base::WrapUnique(
+          new BlobChannelSender(base::WrapUnique(new InMemoryBlobCache),
+                                base::WrapUnique(blob_delegate_)))),

[Wez, 2016/05/21 01:08:05]

Ick! Really not keen on this thing of passing ownership but retaining a
bare-pointer.

Can we switch to having the delegate be supplied to the sender after
construction, for example?

[Kevin M, 2016/05/27 22:35:31]

Done.

[Wez, 2016/06/07 01:18:31]

Looks like you're still doing the same thing, except that you're doing it in the
constructor body rather than in the initializers.

What I meant was that RegisterFeatures() is the only user of |blob_delegate_|,
so could you instantiate the BlobChannelSenderImpl and pass it the
BlobSenderDelegate _after_ having registered the delegate with the
ThreadPipeManager..?

       net_components_(
           new EngineNetworkComponents(net_log,
                                       QuitCurrentMessageLoopClosure())) {
   DCHECK(engine_config_);
   DCHECK(settings_manager_);
-  screen_->UpdateDisplayScaleAndSize(kDefaultScaleFactor,
-                                     gfx::Size(kDefaultDisplayWidth,
-                                               kDefaultDisplayHeight));
+  screen_->UpdateDisplayScaleAndSize(
+      kDefaultScaleFactor,
+      gfx::Size(kDefaultDisplayWidth, kDefaultDisplayHeight));
   render_widget_feature_.SetDelegate(kDummyTabId, this);
 }
 
 BlimpEngineSession::~BlimpEngineSession() {
   render_widget_feature_.RemoveDelegate(kDummyTabId);
 
   window_tree_host_->GetInputMethod()->RemoveObserver(this);
 
   // Ensure that all WebContents are torn down first, since teardown will
   // trigger RenderViewDeleted callbacks to their observers.
@@ skipping 67 matching lines @@
                                             &render_widget_feature_));
   render_widget_feature_.set_input_message_sender(
       thread_pipe_manager_->RegisterFeature(BlimpMessage::INPUT,
                                             &render_widget_feature_));
   render_widget_feature_.set_compositor_message_sender(
       thread_pipe_manager_->RegisterFeature(BlimpMessage::COMPOSITOR,
                                             &render_widget_feature_));
   render_widget_feature_.set_ime_message_sender(
       thread_pipe_manager_->RegisterFeature(BlimpMessage::IME,
                                             &render_widget_feature_));
+  blob_delegate_->set_outgoing_message_processor(
+      thread_pipe_manager_->RegisterFeature(BlimpMessage::BLOB_CHANNEL,
+                                            blob_delegate_));
 
   // The Settings feature does not need an outgoing message processor, since we
   // don't send any messages to the client right now.
   thread_pipe_manager_->RegisterFeature(BlimpMessage::SETTINGS,
                                         &settings_feature_);
 }
 
 bool BlimpEngineSession::CreateWebContents(const int target_tab_id) {
   DVLOG(1) << "Create tab " << target_tab_id;
   // TODO(haibinlu): Support more than one active WebContents (crbug/547231).
@@ skipping 264 matching lines @@
   if (changed_flags & content::InvalidateTypes::INVALIDATE_TYPE_TITLE)
     details->set_title(base::UTF16ToUTF8(source->GetTitle()));
 
   if (changed_flags & content::InvalidateTypes::INVALIDATE_TYPE_LOAD)
     details->set_loading(source->IsLoading());
 
   navigation_message_sender_->ProcessMessage(std::move(message),
                                              net::CompletionCallback());
 }
 
-void BlimpEngineSession::LoadProgressChanged(
-    content::WebContents* source, double progress) {
+void BlimpEngineSession::LoadProgressChanged(content::WebContents* source,
+                                             double progress) {
   if (source != web_contents_.get())
     return;
 
   bool page_load_completed = (progress == 1.0);
 
   // If the client has been notified of a page load completed change, avoid
   // sending another message. For the first navigation, the initial value used
   // by the client is already false.
   if (last_page_load_completed_value_ == page_load_completed)
     return;
@@ skipping 41 matching lines @@
 
   aura::Window* parent = window_tree_host_->window();
   aura::Window* content = web_contents_->GetNativeView();
   if (!parent->Contains(content))
     parent->AddChild(content);
   content->Show();
 }
 
 }  // namespace engine
 }  // namespace blimp