Fork cc::OutputSurface into cc::CompositorFrameSink.

blimp/client/app/compositor/browser_compositor.h

 // 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.
 
 #ifndef BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_
 #define BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_
 
 #include "base/macros.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 44 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 {}
 
-  void HandlePendingOutputSurfaceRequest();
+  void HandlePendingCompositorFrameSinkRequest();
 
   CompositorDependencies* compositor_dependencies_;
 
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   gfx::AcceleratedWidget widget_;
-  bool output_surface_request_pending_;
+  bool compositor_frame_sink_request_pending_;
   std::unique_ptr<cc::Display> display_;
 
   gfx::Size viewport_size_in_px_;
 
   std::unique_ptr<cc::LayerTreeHostInterface> host_;
   scoped_refptr<cc::Layer> root_layer_;
 
   base::Closure did_complete_swap_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserCompositor);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_