Clean up RenderWidgetHostView(ChildFrame and Guest) compositing code

content/common/frame_messages.h

Index: content/common/frame_messages.h
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index c2d8c476b3220d512d45051c82d7c9e6019f13f5..0c2e5ddf655710745516e47385c2001ff77f2165 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -15,6 +15,7 @@
 
 #include "build/build_config.h"
 #include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
@@ -610,10 +611,8 @@ IPC_STRUCT_TRAITS_END()
 // -----------------------------------------------------------------------------
 // Messages sent from the browser to the renderer.
 
-IPC_MESSAGE_ROUTED4(FrameMsg_SetChildFrameSurface,
-                    cc::SurfaceId /* surface_id */,
-                    gfx::Size /* frame_size */,
-                    float /* scale_factor */,
+IPC_MESSAGE_ROUTED2(FrameMsg_SetChildFrameSurface,
+                    cc::SurfaceInfo /* surface_info */,
                     cc::SurfaceSequence /* sequence */)
 
 // Notifies the embedding frame that the process rendering the child frame's