Fork cc::OutputSurface into cc::CompositorFrameSink.

content/browser/renderer_host/render_widget_host_view_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_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 132 matching lines @@
                               InputEventAckState ack_result) override;
   InputEventAckState FilterInputEvent(
       const blink::WebInputEvent& input_event) override;
   void OnSetNeedsFlushInput() override;
   void GestureEventAck(const blink::WebGestureEvent& event,
                        InputEventAckState ack_result) override;
   BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
       BrowserAccessibilityDelegate* delegate, bool for_root_frame) override;
   bool LockMouse() override;
   void UnlockMouse() override;
-  void OnSwapCompositorFrame(uint32_t output_surface_id,
+  void OnSwapCompositorFrame(uint32_t compositor_frame_sink_id,
                              cc::CompositorFrame frame) override;
   void ClearCompositorFrame() override;
   void DidOverscroll(const ui::DidOverscrollParams& params) override;
   void DidStopFlinging() override;
   uint32_t GetSurfaceClientId() override;
   void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
                                const SkBitmap& zoomed_bitmap) override;
   std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
       override;
   void LockCompositingSurface() override;
@@ skipping 75 matching lines @@
   void OnShowingPastePopup(const gfx::PointF& point);
   void OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip);
 
   void SynchronousFrameMetadata(cc::CompositorFrameMetadata frame_metadata);
 
   static void OnContextLost();
 
  private:
   void RunAckCallbacks();
 
-  void CheckOutputSurfaceChanged(uint32_t output_surface_id);
+  void CheckCompositorFrameSinkChanged(uint32_t compositor_frame_sink_id);
   void SubmitCompositorFrame(cc::CompositorFrame frame_data);
-  void SendReclaimCompositorResources(uint32_t output_surface_id,
+  void SendReclaimCompositorResources(uint32_t compositor_frame_sink_id,
                                       bool is_swap_ack);
 
   void OnFrameMetadataUpdated(const cc::CompositorFrameMetadata& frame_metadata,
                               bool is_transparent);
 
   void ShowInternal();
   void HideInternal();
   void AttachLayers();
   void RemoveLayers();
 
@@ skipping 14 matching lines @@
                                const ReadbackRequestCallback& callback,
                                const SkColorType color_type);
 
   // If we have locks on a frame during a ContentViewCore swap or a context
   // lost, the frame is no longer valid and we can safely release all the locks.
   // Use this method to release all the locks.
   void ReleaseLocksOnSurface();
 
   // Drop any incoming frames from the renderer when there are locks on the
   // current frame.
-  void RetainFrame(uint32_t output_surface_id, cc::CompositorFrame frame);
+  void RetainFrame(uint32_t compositor_frame_sink_id,
+                   cc::CompositorFrame frame);
 
-  void InternalSwapCompositorFrame(uint32_t output_surface_id,
+  void InternalSwapCompositorFrame(uint32_t compositor_frame_sink_id,
                                    cc::CompositorFrame frame);
   void DestroyDelegatedContent();
   void OnLostResources();
 
   void ReturnResources(const cc::ReturnedResourceArray& resources);
 
   enum VSyncRequestType {
     FLUSH_INPUT = 1 << 0,
     BEGIN_FRAME = 1 << 1,
     PERSISTENT_BEGIN_FRAME = 1 << 2
@@ skipping 33 matching lines @@
 
   // Manages the Compositor Frames received from the renderer.
   std::unique_ptr<ui::DelegatedFrameHostAndroid> delegated_frame_host_;
 
   cc::ReturnedResourceArray surface_returned_resources_;
 
   // The most recent surface size that was pushed to the surface layer.
   gfx::Size current_surface_size_;
 
   // The output surface id of the last received frame.
-  uint32_t last_output_surface_id_;
-
+  uint32_t last_compositor_frame_sink_id_;
 
   std::queue<base::Closure> ack_callbacks_;
 
   // Used to control and render overscroll-related effects.
   std::unique_ptr<OverscrollControllerAndroid> overscroll_controller_;
 
   // Provides gesture synthesis given a stream of touch events (derived from
   // Android MotionEvent's) and touch event acks.
   ui::FilteredGestureProvider gesture_provider_;
 
@@ skipping 11 matching lines @@
   std::unique_ptr<SynchronousCompositorHost> sync_compositor_;
 
   std::unique_ptr<DelegatedFrameEvictor> frame_evictor_;
 
   size_t locks_on_frame_count_;
   bool observing_root_window_;
 
   struct LastFrameInfo {
     LastFrameInfo(uint32_t output_id, cc::CompositorFrame output_frame);
     ~LastFrameInfo();
-    uint32_t output_surface_id;
+    uint32_t compositor_frame_sink_id;
     cc::CompositorFrame frame;
   };
 
   std::unique_ptr<LastFrameInfo> last_frame_info_;
 
   // The last scroll offset of the view.
   gfx::Vector2dF last_scroll_offset_;
 
   base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_