content: Add ContextProviderFactory to create a render ContextProvider.

content/browser/renderer_host/compositor_impl_android.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/public/browser/android/compositor.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "third_party/khronos/GLES2/gl2.h"
+#include "ui/android/context_provider_factory.h"
 #include "ui/android/resources/resource_manager_impl.h"
 #include "ui/android/resources/ui_resource_provider.h"
 #include "ui/android/window_android_compositor.h"
 
 class SkBitmap;
 struct ANativeWindow;
 
 namespace cc {
 class Display;
 class Layer;
 class LayerTreeHost;
 class SurfaceIdAllocator;
 class SurfaceManager;
+class VulkanContextProvider;
 class VulkanInProcessContextProvider;
 }
 
 namespace content {
 class CompositorClient;
 
 // -----------------------------------------------------------------------------
 // Browser-side compositor that manages a tree of content and UI layers.
 // -----------------------------------------------------------------------------
 class CONTENT_EXPORT CompositorImpl
     : public Compositor,
       public cc::LayerTreeHostClient,
       public cc::LayerTreeHostSingleThreadClient,
       public ui::UIResourceProvider,
       public ui::WindowAndroidCompositor {
  public:
   class VSyncObserver {
    public:
     virtual void OnVSync(base::TimeTicks timebase,
                          base::TimeDelta interval) = 0;
   };
 
   CompositorImpl(CompositorClient* client, gfx::NativeWindow root_window);
   ~CompositorImpl() override;
 
   static bool IsInitialized();
 
-  static cc::SurfaceManager* GetSurfaceManager();
-  static uint32_t AllocateSurfaceClientId();
-
-  static scoped_refptr<cc::VulkanInProcessContextProvider>
-  SharedVulkanContextProviderAndroid();
-
   void PopulateGpuCapabilities(gpu::Capabilities gpu_capabilities);
 
   void AddObserver(VSyncObserver* observer);
   void RemoveObserver(VSyncObserver* observer);
   void OnNeedsBeginFramesChange(bool needs_begin_frames);
 
   // ui::ResourceProvider implementation.
   cc::UIResourceId CreateUIResource(cc::UIResourceClient* client) override;
   void DeleteUIResource(cc::UIResourceId resource_id) override;
   bool SupportsETC1NonPowerOfTwo() const override;
@@ skipping 33 matching lines @@
   void DidPostSwapBuffers() override;
   void DidAbortSwapBuffers() override;
 
   // WindowAndroidCompositor implementation.
   void RequestCopyOfOutputOnRootLayer(
       std::unique_ptr<cc::CopyOutputRequest> request) override;
   void OnVSync(base::TimeTicks frame_time,
                base::TimeDelta vsync_period) override;
   void SetNeedsAnimate() override;
   void SetVisible(bool visible);
-  void CreateOutputSurface();
   void CreateLayerTreeHost();
 
-  void OnGpuChannelEstablished();
-  void OnGpuChannelTimeout();
+  void HandlePendingOutputSurfaceRequest();
+
+#if defined(ENABLE_VULKAN)
+  void CreateVulkanOutputSurface();
+#endif
+  void CreateCompositorOutputSurface(
+      const scoped_refptr<cc::ContextProvider>& context_provider);
+  void InitializeDisplay(
+      std::unique_ptr<cc::OutputSurface> display_output_surface,
+      scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
+      scoped_refptr<cc::ContextProvider> context_provider);
 
   // root_layer_ is the persistent internal root layer, while subroot_layer_
   // is the one attached by the compositor client.
   scoped_refptr<cc::Layer> subroot_layer_;
 
   // Destruction order matters here:
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   base::ObserverList<VSyncObserver, true> observer_list_;
   std::unique_ptr<cc::LayerTreeHost> host_;
   ui::ResourceManagerImpl resource_manager_;
@@ skipping 13 matching lines @@
 
   // Whether we need to update animations on the next composite.
   bool needs_animate_;
 
   // The number of SwapBuffer calls that have not returned and ACK'd from
   // the GPU thread.
   unsigned int pending_swapbuffers_;
 
   size_t num_successive_context_creation_failures_;
 
-  base::OneShotTimer establish_gpu_channel_timeout_;
-
   // Whether there is an OutputSurface request pending from the current
   // |host_|. Becomes |true| if RequestNewOutputSurface is called, and |false|
   // if |host_| is deleted or we succeed in creating *and* initializing an
   // OutputSurface (which is essentially the contract with cc).
   bool output_surface_request_pending_;
 
   gpu::Capabilities gpu_capabilities_;
   bool needs_begin_frames_;
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_