FrameGenerator should receive SurfaceInfo and use it in frame generation

cc/surfaces/surface_factory_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 "cc/surfaces/surface_factory.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 69 matching lines @@
   }
 
   const SurfaceId& last_created_surface_id() const {
     return last_created_surface_id_;
   }
 
   // SurfaceObserver implementation.
   void OnSurfaceCreated(const SurfaceInfo& surface_info) override {
     EXPECT_EQ(kArbitraryFrameSinkId, surface_info.id().frame_sink_id());
     last_created_surface_id_ = surface_info.id();
+    last_surface_info_ = surface_info;
   }
 
   void OnSurfaceDamaged(const SurfaceId& id, bool* changed) override {
     *changed = true;
   }
 
   ~SurfaceFactoryTest() override {
     manager_.RemoveObserver(this);
     factory_->EvictSurface();
   }
@@ skipping 48 matching lines @@
         SurfaceId(factory_->frame_sink_id(), local_frame_id_));
     factory_->RefResources(surface->GetEligibleFrame().resource_list);
   }
 
  protected:
   SurfaceManager manager_;
   TestSurfaceFactoryClient client_;
   std::unique_ptr<SurfaceFactory> factory_;
   LocalFrameId local_frame_id_;
   SurfaceId last_created_surface_id_;
+  SurfaceInfo last_surface_info_;
 
   // This is the sync token submitted with the frame. It should never be
   // returned to the client.
   const gpu::SyncToken frame_sync_token_;
 
   // This is the sync token returned by the consumer. It should always be
   // returned to the client.
   const gpu::SyncToken consumer_sync_token_;
 };
 
@@ skipping 494 matching lines @@
   EXPECT_FALSE(called2);
   EXPECT_FALSE(called3);
 
   factory_->EvictSurface();
   local_frame_id_ = LocalFrameId();
   EXPECT_TRUE(called1);
   EXPECT_TRUE(called2);
   EXPECT_TRUE(called3);
 }
 
+// Check whether the SurfaceInfo object is created and populated correctly
+// after the frame submission.
+TEST_F(SurfaceFactoryTest, SurfaceInfo) {
+  CompositorFrame frame;
+
+  auto render_pass = RenderPass::Create();
+  render_pass->SetNew(1, gfx::Rect(0, 0, 5, 6), gfx::Rect(), gfx::Transform());

[danakj, 2017/01/24 22:37:19]

nit: Rect(5,6) is a bit more consise than Rect(0,0,5,6)

+  frame.render_pass_list.push_back(std::move(render_pass));
+
+  render_pass = RenderPass::Create();
+  render_pass->SetNew(2, gfx::Rect(0, 0, 7, 8), gfx::Rect(), gfx::Transform());
+  frame.render_pass_list.push_back(std::move(render_pass));
+
+  frame.metadata.device_scale_factor = 2.5f;
+
+  factory_->SubmitCompositorFrame(local_frame_id_, std::move(frame),
+                                  SurfaceFactory::DrawCallback());
+  SurfaceId expected_surface_id(factory_->frame_sink_id(), local_frame_id_);
+  EXPECT_EQ(expected_surface_id, last_surface_info_.id());
+  EXPECT_EQ(2.5f, last_surface_info_.device_scale_factor());
+  EXPECT_EQ(gfx::Size(7, 8), last_surface_info_.size_in_pixels());
+}
+
 }  // namespace
 }  // namespace cc