Fork cc::OutputSurface into cc::CompositorFrameSink.

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>
@@ skipping 17 matching lines @@
 #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 OutputSurface;
 class SurfaceIdAllocator;
 class SurfaceManager;
 class VulkanContextProvider;
 class VulkanInProcessContextProvider;
 }
 
 namespace content {
 class CompositorClient;
 
 // -----------------------------------------------------------------------------
@@ skipping 43 matching lines @@
   void WillBeginMainFrame() override {}
   void DidBeginMainFrame() override {}
   void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
   void BeginMainFrameNotExpectedSoon() override {}
   void UpdateLayerTreeHost() override;
   void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta,
                            const gfx::Vector2dF& outer_delta,
                            const gfx::Vector2dF& elastic_overscroll_delta,
                            float page_scale,
                            float top_controls_delta) override {}
-  void RequestNewOutputSurface() override;
-  void DidInitializeOutputSurface() override;
-  void DidFailToInitializeOutputSurface() override;
+  void RequestNewCompositorFrameSink() override;
+  void DidInitializeCompositorFrameSink() override;
+  void DidFailToInitializeCompositorFrameSink() override;
   void WillCommit() override {}
   void DidCommit() override;
   void DidCommitAndDrawFrame() override {}
   void DidCompleteSwapBuffers() override;
   void DidCompletePageScaleAnimation() override {}
 
   // LayerTreeHostSingleThreadClient implementation.
   void DidPostSwapBuffers() override;
   void DidAbortSwapBuffers() override;
 
   // WindowAndroidCompositor implementation.
   void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override;
   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 CreateLayerTreeHost();
 
-  void HandlePendingOutputSurfaceRequest();
+  void HandlePendingCompositorFrameSinkRequest();
 
 #if defined(ENABLE_VULKAN)
   void CreateVulkanOutputSurface();
 #endif
   void OnGpuChannelEstablished(
       scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
       ui::ContextProviderFactory::GpuChannelHostResult result);
   void InitializeDisplay(
       std::unique_ptr<cc::OutputSurface> display_output_surface,
       scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
@@ skipping 29 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_;
 
-  // Whether there is an OutputSurface request pending from the current
+  // Whether there is an CompositorFrameSink request pending from the current
   // |host_|. Becomes |true| if RequestNewOutputSurface is called, and |false|

[enne (OOO), 2016/09/14 00:35:45]

RequestNewCompositorFrameSink?

   // if |host_| is deleted or we succeed in creating *and* initializing an
   // OutputSurface (which is essentially the contract with cc).

[enne (OOO), 2016/09/14 00:35:45]

CompositorFrameSink?

-  bool output_surface_request_pending_;
+  bool compositor_frame_sink_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_