content/ui[Android]: Remove ContextProviderFactory.

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/surfaces/frame_sink_id.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/public/browser/android/compositor.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.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"
 
 struct ANativeWindow;
 
 namespace cc {
 class AnimationHost;
 class Display;
+class FrameSinkId;
 class Layer;
 class LayerTreeHost;
 class OutputSurface;
+class SurfaceManager;
 class VulkanContextProvider;
 }
 
 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:
   CompositorImpl(CompositorClient* client, gfx::NativeWindow root_window);
   ~CompositorImpl() override;
 
   static bool IsInitialized();
 
+  static cc::SurfaceManager* GetSurfaceManager();
+  static cc::FrameSinkId AllocateFrameSinkId();
+
   // ui::ResourceProvider implementation.
   cc::UIResourceId CreateUIResource(cc::UIResourceClient* client) override;
   void DeleteUIResource(cc::UIResourceId resource_id) override;
   bool SupportsETC1NonPowerOfTwo() const override;
 
  private:
   // Compositor implementation.
   void SetRootLayer(scoped_refptr<cc::Layer> root) override;
   void SetSurface(jobject surface) override;
   void SetWindowBounds(const gfx::Size& size) override;
@@ skipping 37 matching lines @@
 
   void SetVisible(bool visible);
   void CreateLayerTreeHost();
 
   void HandlePendingCompositorFrameSinkRequest();
 
 #if defined(ENABLE_VULKAN)
   void CreateVulkanOutputSurface();
 #endif
   void OnGpuChannelEstablished(
-      scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
-      ui::ContextProviderFactory::GpuChannelHostResult result);
+      scoped_refptr<gpu::GpuChannelHost> gpu_channel_host);
+  void OnGpuChannelTimeout();
   void InitializeDisplay(
       std::unique_ptr<cc::OutputSurface> display_output_surface,
       scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
       scoped_refptr<cc::ContextProvider> context_provider);
 
   bool HavePendingReadbacks();
   void SetBackgroundColor(int color);
 
   cc::FrameSinkId frame_sink_id_;
 
@@ skipping 23 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_;
 
+  size_t num_successive_gpu_initialization_failures_;
+  base::OneShotTimer establish_gpu_channel_timeout_;
+
   // Whether there is an CompositorFrameSink request pending from the current
   // |host_|. Becomes |true| if RequestNewCompositorFrameSink is called, and
   // |false| if |host_| is deleted or we succeed in creating *and* initializing
   // a CompositorFrameSink (which is essentially the contract with cc).
   bool compositor_frame_sink_request_pending_;
 
   gpu::Capabilities gpu_capabilities_;
   bool has_compositor_frame_sink_ = false;
   std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash>
       pending_child_frame_sink_ids_;
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_