gpu: Have GpuService create and own GpuMemoryBufferFactory.

services/ui/gpu/gpu_service.cc

 // Copyright 2016 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 "services/ui/gpu/gpu_service.h"
 
 #include "base/bind.h"
 #include "base/debug/crash_logging.h"
 #include "base/lazy_instance.h"
 #include "base/memory/shared_memory.h"
@@ skipping 67 matching lines @@
 
 void DestroyBinding(
     std::unique_ptr<mojo::BindingSet<mojom::GpuService>> binding) {
   binding->CloseAllBindings();
 }
 
 }  // namespace
 
 GpuService::GpuService(const gpu::GPUInfo& gpu_info,
                        std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread,
-                       gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory,
                        scoped_refptr<base::SingleThreadTaskRunner> io_runner,
                        const gpu::GpuFeatureInfo& gpu_feature_info)
     : main_runner_(base::ThreadTaskRunnerHandle::Get()),
       io_runner_(std::move(io_runner)),
       watchdog_thread_(std::move(watchdog_thread)),
-      gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
+      gpu_memory_buffer_factory_(
+          gpu::GpuMemoryBufferFactory::CreateNativeType()),
       gpu_info_(gpu_info),
       gpu_feature_info_(gpu_feature_info),
       sync_point_manager_(nullptr),
       bindings_(base::MakeUnique<mojo::BindingSet<mojom::GpuService>>()),
       weak_ptr_factory_(this) {
   weak_ptr_ = weak_ptr_factory_.GetWeakPtr();
 }
 
 GpuService::~GpuService() {
   DCHECK(main_runner_->BelongsToCurrentThread());
@@ skipping 62 matching lines @@
         base::WaitableEvent::InitialState::NOT_SIGNALED);
     shutdown_event_ = owned_shutdown_event_.get();
   }
 
   // Defer creation of the render thread. This is to prevent it from handling
   // IPC messages before the sandbox has been enabled and all other necessary
   // initialization has succeeded.
   gpu_channel_manager_.reset(new gpu::GpuChannelManager(
       gpu_preferences_, this, watchdog_thread_.get(),
       base::ThreadTaskRunnerHandle::Get(), io_runner_, sync_point_manager_,
-      gpu_memory_buffer_factory_, gpu_feature_info_,
+      gpu_memory_buffer_factory_.get(), gpu_feature_info_,
       std::move(activity_flags)));
 
   media_gpu_channel_manager_.reset(
       new media::MediaGpuChannelManager(gpu_channel_manager_.get()));
   if (watchdog_thread())
     watchdog_thread()->AddPowerObserver();
 }
 
 void GpuService::Bind(mojom::GpuServiceRequest request) {
   if (main_runner_->BelongsToCurrentThread()) {
     bind_task_tracker_.PostTask(
         io_runner_.get(), FROM_HERE,
         base::Bind(&GpuService::Bind, base::Unretained(this),
                    base::Passed(std::move(request))));
     return;
   }
   bindings_->AddBinding(this, std::move(request));
 }
 
+gpu::ImageFactory* GpuService::gpu_image_factory() {
+  return gpu_memory_buffer_factory_
+             ? gpu_memory_buffer_factory_->AsImageFactory()
+             : nullptr;
+}
+
 void GpuService::RecordLogMessage(int severity,
                                   size_t message_start,
                                   const std::string& str) {
   // This can be run from any thread.
   std::string header = str.substr(0, message_start);
   std::string message = str.substr(message_start);
   (*gpu_host_)->RecordLogMessage(severity, header, message);
 }
 
 void GpuService::CreateGpuMemoryBuffer(
@@ skipping 295 matching lines @@
 
 void GpuService::Stop(const StopCallback& callback) {
   DCHECK(io_runner_->BelongsToCurrentThread());
   main_runner_->PostTaskAndReply(FROM_HERE, base::Bind([] {
                                    base::MessageLoop::current()->QuitWhenIdle();
                                  }),
                                  callback);
 }
 
 }  // namespace ui