Fork cc::OutputSurface into cc::CompositorFrameSink.

android_webview/browser/child_frame.h

Index: android_webview/browser/child_frame.h
diff --git a/android_webview/browser/child_frame.h b/android_webview/browser/child_frame.h
index 2cc3a4640e34a40ad3554b6cfbce90e65f662cf8..2d37502787b08d3e009999f5c293b73074ca7a0f 100644
--- a/android_webview/browser/child_frame.h
+++ b/android_webview/browser/child_frame.h
@@ -21,7 +21,7 @@ namespace android_webview {
 
 class ChildFrame {
  public:
-  ChildFrame(uint32_t output_surface_id,
+  ChildFrame(uint32_t compositor_frame_sink_id,
              std::unique_ptr<cc::CompositorFrame> frame,
              const CompositorID& compositor_id,
              bool viewport_rect_for_tile_priority_empty,
@@ -30,7 +30,7 @@ class ChildFrame {
              bool is_layer);
   ~ChildFrame();
 
-  const uint32_t output_surface_id;
+  const uint32_t compositor_frame_sink_id;
   std::unique_ptr<cc::CompositorFrame> frame;
   // The id of the compositor this |frame| comes from.
   const CompositorID compositor_id;