Mandoline: Merge Surfaces and Views apps

components/html_viewer/html_document.cc

 // Copyright 2014 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 "components/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 282 matching lines @@
 
 void HTMLDocument::initializeLayerTreeView() {
   if (global_state_->is_headless()) {
     web_layer_tree_view_impl_.reset(
         new WebLayerTreeViewImpl(global_state_->compositor_thread(), nullptr,
                                  nullptr, nullptr, nullptr));
     return;
   }
 
   mojo::URLRequestPtr request(mojo::URLRequest::New());
-  request->url = mojo::String::From("mojo:surfaces_service");
+  request->url = mojo::String::From("mojo:view_manager");
   mojo::SurfacePtr surface;
   html_document_app_->ConnectToService(request.Pass(), &surface);
 
   // TODO(jamesr): Should be mojo:gpu_service

[rjkroege, 2015/08/06 22:39:11]

my presumption is that its existence is to permit a gpu process.

[Fady Samuel, 2015/08/07 01:15:21]

Yes, we can split GL off to a GPU process if we need to...I'm wondering if
that's necessary or even desired though.

   mojo::URLRequestPtr request2(mojo::URLRequest::New());
   request2->url = mojo::String::From("mojo:view_manager");
   mojo::GpuPtr gpu_service;
   html_document_app_->ConnectToService(request2.Pass(), &gpu_service);
   web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl(
       global_state_->compositor_thread(),
       global_state_->gpu_memory_buffer_manager(),
       global_state_->raster_thread_helper()->task_graph_runner(),
       surface.Pass(), gpu_service.Pass()));
 }
@@ skipping 150 matching lines @@
 
 void HTMLDocument::UpdateFocus() {
   if (!web_view_)
     return;
   bool is_focused = root_ && root_->HasFocus();
   web_view_->setFocus(is_focused);
   web_view_->setIsActive(is_focused);
 }
 
 }  // namespace html_viewer