Clean up RenderWidgetHostView(ChildFrame and Guest) compositing code

content/browser/frame_host/render_widget_host_view_guest_unittest.cc

 // 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.
 
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 108 matching lines @@
   ASSERT_TRUE(view_->IsShowing());
 
   view_->Hide();
   ASSERT_FALSE(view_->IsShowing());
 }
 
 class TestBrowserPluginGuest : public BrowserPluginGuest {
  public:
   TestBrowserPluginGuest(WebContentsImpl* web_contents,
                          BrowserPluginGuestDelegate* delegate)
-      : BrowserPluginGuest(web_contents->HasOpener(), web_contents, delegate),
-        last_scale_factor_received_(0.f) {}
+      : BrowserPluginGuest(web_contents->HasOpener(), web_contents, delegate) {}
+
   ~TestBrowserPluginGuest() override {}
 
-  void ResetTestData() {
-    last_surface_id_received_ = cc::SurfaceId();
-    last_frame_size_received_ = gfx::Size();
-    last_scale_factor_received_ = 0.f;
-  }
+  void ResetTestData() { last_surface_info_ = cc::SurfaceInfo(); }
 
   void set_has_attached_since_surface_set(bool has_attached_since_surface_set) {
     BrowserPluginGuest::set_has_attached_since_surface_set_for_test(
         has_attached_since_surface_set);
   }
 
   void set_attached(bool attached) {
     BrowserPluginGuest::set_attached_for_test(attached);
   }
 
-  void SetChildFrameSurface(const cc::SurfaceId& surface_id,
-                            const gfx::Size& frame_size,
-                            float scale_factor,
+  void SetChildFrameSurface(const cc::SurfaceInfo& surface_info,
                             const cc::SurfaceSequence& sequence) override {
-    last_surface_id_received_ = surface_id;
-    last_frame_size_received_ = frame_size;
-    last_scale_factor_received_ = scale_factor;
+    last_surface_info_ = surface_info;
   }
 
-  cc::SurfaceId last_surface_id_received_;
-  gfx::Size last_frame_size_received_;
-  float last_scale_factor_received_;
+  cc::SurfaceInfo last_surface_info_;
 };
 
 // TODO(wjmaclean): we should restructure RenderWidgetHostViewChildFrameTest to
 // look more like this one, and then this one could be derived from it. Also,
 // include CreateDelegatedFrame as part of the test class so we don't have to
 // repeat it here.
 class RenderWidgetHostViewGuestSurfaceTest
     : public testing::Test {
  public:
   RenderWidgetHostViewGuestSurfaceTest()
@@ skipping 107 matching lines @@
     ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
     cc::SurfaceManager* manager =
         factory->GetContextFactoryPrivate()->GetSurfaceManager();
     cc::Surface* surface = manager->GetSurfaceForId(id);
     EXPECT_TRUE(surface);
     // There should be a SurfaceSequence created by the RWHVGuest.
     EXPECT_EQ(1u, surface->GetDestructionDependencyCount());
 #endif
     // Surface ID should have been passed to BrowserPluginGuest to
     // be sent to the embedding renderer.
-    EXPECT_EQ(id, browser_plugin_guest_->last_surface_id_received_);
-    EXPECT_EQ(view_size, browser_plugin_guest_->last_frame_size_received_);
-    EXPECT_EQ(scale_factor, browser_plugin_guest_->last_scale_factor_received_);
+    EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size),
+              browser_plugin_guest_->last_surface_info_);
   }
 
   browser_plugin_guest_->ResetTestData();
   browser_plugin_guest_->set_has_attached_since_surface_set(true);
 
   view_->OnSwapCompositorFrame(
       0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
 
   id = GetSurfaceId();
   if (id.is_valid()) {
 #if !defined(OS_ANDROID)
     ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
     cc::SurfaceManager* manager =
         factory->GetContextFactoryPrivate()->GetSurfaceManager();
     cc::Surface* surface = manager->GetSurfaceForId(id);
     EXPECT_TRUE(surface);
     // There should be a SurfaceSequence created by the RWHVGuest.
     EXPECT_EQ(1u, surface->GetDestructionDependencyCount());
 #endif
     // Surface ID should have been passed to BrowserPluginGuest to
     // be sent to the embedding renderer.
-    EXPECT_EQ(id, browser_plugin_guest_->last_surface_id_received_);
-    EXPECT_EQ(view_size, browser_plugin_guest_->last_frame_size_received_);
-    EXPECT_EQ(scale_factor,
-              browser_plugin_guest_->last_scale_factor_received_);
+    EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size),
+              browser_plugin_guest_->last_surface_info_);
   }
 
   browser_plugin_guest_->set_attached(false);
   browser_plugin_guest_->ResetTestData();
 
   view_->OnSwapCompositorFrame(
       0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
   EXPECT_FALSE(GetSurfaceId().is_valid());
 }
 
 }  // namespace content