Clean up RenderWidgetHostView(ChildFrame and Guest) compositing code

content/browser/frame_host/cross_process_frame_connector.h

 // Copyright 2014 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_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_
 #define CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_
 
 #include <stdint.h>
 
 #include "cc/output/compositor_frame.h"
 #include "content/browser/renderer_host/event_with_latency_info.h"
 #include "content/common/content_export.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace blink {
 class WebGestureEvent;
 class WebInputEvent;
 }
 
 namespace cc {
 class SurfaceId;
+class SurfaceInfo;
 struct SurfaceSequence;
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace content {
 class RenderFrameProxyHost;
 class RenderWidgetHostViewBase;
@@ skipping 45 matching lines @@
 
   bool OnMessageReceived(const IPC::Message &msg);
 
   // |view| corresponds to B2's RenderWidgetHostViewChildFrame in the example
   // above.
   void set_view(RenderWidgetHostViewChildFrame* view);
   RenderWidgetHostViewChildFrame* get_view_for_testing() { return view_; }
 
   void RenderProcessGone();
 
-  virtual void SetChildFrameSurface(const cc::SurfaceId& surface_id,
-                                    const gfx::Size& frame_size,
-                                    float scale_factor,
+  virtual void SetChildFrameSurface(const cc::SurfaceInfo& surface_info,
                                     const cc::SurfaceSequence& sequence);
 
   gfx::Rect ChildFrameRect();
   void UpdateCursor(const WebCursor& cursor);
   gfx::Point TransformPointToRootCoordSpace(const gfx::Point& point,
                                             const cc::SurfaceId& surface_id);
   // TransformPointToLocalCoordSpace() can only transform points between
   // surfaces where one is embedded (not necessarily directly) within the
   // other, and will return false if this is not the case. For points that can
   // be in sibling surfaces, they must first be converted to the root
@@ skipping 60 matching lines @@
 
   gfx::Rect child_frame_rect_;
 
   bool is_scroll_bubbling_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_