RendererCompositorFrameSink should handle local surface id allocation

content/browser/frame_host/render_widget_host_view_child_frame_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_child_frame.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 15 matching lines @@
 #include "content/common/view_messages.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/test/test_render_view_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor.h"
 
 namespace content {
 namespace {
+
+const cc::LocalSurfaceId kArbitraryLocalSurfaceId(
+    1,
+    base::UnguessableToken::Deserialize(2, 3));
+
 class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
  public:
   MockRenderWidgetHostDelegate() {}
   ~MockRenderWidgetHostDelegate() override {}
  private:
   void Cut() override {}
   void Copy() override {}
   void Paste() override {}
   void SelectAll() override {}
 };
@@ skipping 54 matching lines @@
     base::RunLoop().RunUntilIdle();
 #if !defined(OS_ANDROID)
     ImageTransportFactory::Terminate();
 #endif
   }
 
   cc::SurfaceId GetSurfaceId() const {
     return cc::SurfaceId(view_->frame_sink_id_, view_->local_surface_id_);
   }
 
+  cc::LocalSurfaceId GetLocalSurfaceId() const {
+    return view_->local_surface_id_;
+  }
+
   void ClearCompositorSurfaceIfNecessary() {
     view_->ClearCompositorSurfaceIfNecessary();
   }
 
  protected:
   base::MessageLoopForUI message_loop_;
   std::unique_ptr<BrowserContext> browser_context_;
   MockRenderWidgetHostDelegate delegate_;
 
   // Tests should set these to NULL if they've already triggered their
@@ skipping 37 matching lines @@
   view_->Hide();
   ASSERT_FALSE(view_->IsShowing());
 }
 
 // Verify that OnSwapCompositorFrame behavior is correct when a delegated
 // frame is received from a renderer process.
 TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_SwapCompositorFrame) {
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);
   float scale_factor = 1.f;
+  cc::LocalSurfaceId local_surface_id(1, base::UnguessableToken::Create());
 
   view_->SetSize(view_size);
   view_->Show();
 
   view_->OnSwapCompositorFrame(
-      0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
+      0, local_surface_id,
+      CreateDelegatedFrame(scale_factor, view_size, view_rect));
 
   cc::SurfaceId 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 RWHVChildFrame.
     EXPECT_EQ(1u, surface->GetDestructionDependencyCount());
 #endif
 
     // Surface ID should have been passed to CrossProcessFrameConnector to
     // be sent to the embedding renderer.
     EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size),
               test_frame_connector_->last_surface_info_);
   }
 }
 
-// Check that frame eviction does not trigger allocation of a new local surface
-// id.
-TEST_F(RenderWidgetHostViewChildFrameTest,
-       MAYBE_FrameEvictionKeepsLocalSurfaceId) {
+// Check that the same local surface id can be used after frame eviction.
+TEST_F(RenderWidgetHostViewChildFrameTest, FrameEviction) {
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);
   float scale_factor = 1.f;
 
   view_->SetSize(view_size);
   view_->Show();
 
-  // Submit a frame. Remember the local surface id and check that has_frame()
-  // returns true.
+  // Submit a frame.
   view_->OnSwapCompositorFrame(
-      0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
+      0, kArbitraryLocalSurfaceId,
+      CreateDelegatedFrame(scale_factor, view_size, view_rect));
 
-  cc::SurfaceId surface_id = GetSurfaceId();
-  EXPECT_TRUE(surface_id.is_valid());
+  EXPECT_EQ(kArbitraryLocalSurfaceId, GetLocalSurfaceId());
   EXPECT_TRUE(view_->has_frame());
 
-  // Evict the frame. The surface id must remain the same but has_frame() should
-  // return false.
+  // Evict the frame. has_frame() should return false.
   ClearCompositorSurfaceIfNecessary();
-  EXPECT_EQ(surface_id, GetSurfaceId());
+  EXPECT_EQ(kArbitraryLocalSurfaceId, GetLocalSurfaceId());
   EXPECT_FALSE(view_->has_frame());
 
-  // Submit another frame. Since it has the same size and scale as the first
-  // one, the same surface id must be used. has_frame() must return true.
+  // Submit another frame with the same local surface id. The same id should be
+  // usable.
   view_->OnSwapCompositorFrame(
-      0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
-  EXPECT_EQ(surface_id, GetSurfaceId());
+      0, kArbitraryLocalSurfaceId,
+      CreateDelegatedFrame(scale_factor, view_size, view_rect));
+  EXPECT_EQ(kArbitraryLocalSurfaceId, GetLocalSurfaceId());
   EXPECT_TRUE(view_->has_frame());
 }
 
 }  // namespace content