[WIP] cc: Plumb SurfaceId from clients

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

 // Copyright (c) 2012 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/renderer_host/render_widget_host_view_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 1627 matching lines @@
       view_->GetNativeView(), parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_size);
   view_->Show();
   sink_->ClearMessages();
 
   view_->ResetCompositor();
 
   // Swapping a frame should trigger a swap ACK IPC because we have reset the
   // compositor.
-  view_->OnSwapCompositorFrame(0,
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1),
                                MakeDelegatedFrame(1.f, view_size, view_rect));
   EXPECT_EQ(1u, sink_->message_count());
   {
     const IPC::Message* msg = sink_->GetMessageAt(0);
     EXPECT_EQ(ViewMsg_ReclaimCompositorResources::ID, msg->type());
     ViewMsg_ReclaimCompositorResources::Param params;
     ViewMsg_ReclaimCompositorResources::Read(msg, &params);
     EXPECT_EQ(0u, std::get<0>(params));  // output_surface_id
     EXPECT_TRUE(std::get<1>(params));    // is_swap_ack
   }
@@ skipping 31 matching lines @@
 }
 
 // This test verifies that when the output_surface_id changes, then
 // DelegateFrameHost returns compositor resources without a swap ack.
 TEST_F(RenderWidgetHostViewAuraTest, TwoOutputSurfaces) {
   FakeSurfaceDamageObserver damage_observer;
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   cc::SurfaceManager* manager = factory->GetSurfaceManager();
   manager->AddObserver(&damage_observer);
 
+  // Wait for the ui::Compositor to get an OutputSurface and a SurfaceFactory.
+  // The surfaces system will then be able to install a destruction dependency
+  // between the child client and the ui::Compositor ensuring that calling
+  // SurfaceFactory::Destroy on a child surface does not immediately destroy
+  // the surface.
+  aura::Window* root_window = aura_test_helper_->root_window();
+  ui::DrawWaiterForTest::WaitForCompositingInitialized(
+      root_window->GetHost()->compositor());
+
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);
 
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(), parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_size);
   view_->Show();
   sink_->ClearMessages();
 
-  view_->OnSwapCompositorFrame(0,
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1),
                                MakeDelegatedFrame(1.f, view_size, view_rect));
 
   // Accumulate some returned resources. This should not trigger an IPC.
   cc::ReturnedResourceArray resources;
   cc::ReturnedResource resource;
   resource.id = 1;
   resources.push_back(resource);
   view_->ReturnResources(resources);
   EXPECT_EQ(0u, sink_->message_count());
 
   // Swap another CompositorFrame but this time from another output_surface_id.
   // This should trigger a non-ACK ReclaimCompositorResources IPC.
-  view_->OnSwapCompositorFrame(1,
+  view_->OnSwapCompositorFrame(1, cc::SurfaceId(1, 2, 1),
                                MakeDelegatedFrame(1.f, view_size, view_rect));
   EXPECT_EQ(1u, sink_->message_count());
   {
     const IPC::Message* msg = sink_->GetMessageAt(0);
     EXPECT_EQ(ViewMsg_ReclaimCompositorResources::ID, msg->type());
     ViewMsg_ReclaimCompositorResources::Param params;
     ViewMsg_ReclaimCompositorResources::Read(msg, &params);
     EXPECT_EQ(0u, std::get<0>(params));  // output_surface_id
     EXPECT_FALSE(std::get<1>(params));   // is_swap_ack
   }
@@ skipping 34 matching lines @@
     EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
     ViewMsg_Resize::Param params;
     ViewMsg_Resize::Read(msg, &params);
     EXPECT_EQ(
         "0,0 800x600",
         gfx::Rect(std::get<0>(params).screen_info.availableRect).ToString());
     EXPECT_EQ("800x600", std::get<0>(params).new_size.ToString());
     // Resizes are blocked until we swapped a frame of the correct size, and
     // we've committed it.
     view_->OnSwapCompositorFrame(
-        0, MakeDelegatedFrame(1.f, std::get<0>(params).new_size,
-                              gfx::Rect(std::get<0>(params).new_size)));
+        0, cc::SurfaceId(1, 1, 1),
+        MakeDelegatedFrame(1.f, std::get<0>(params).new_size,
+                           gfx::Rect(std::get<0>(params).new_size)));
     ui::DrawWaiterForTest::WaitForCommit(
         root_window->GetHost()->compositor());
   }
 
   widget_host_->ResetSizeAndRepaintPendingFlags();
   sink_->ClearMessages();
 
   // Make sure the corrent screen size is set along in the resize
   // request when the screen size has changed.
   aura_test_helper_->test_screen()->SetUIScale(0.5);
   EXPECT_EQ(1u, sink_->message_count());
   {
     const IPC::Message* msg = sink_->GetMessageAt(0);
     EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
     ViewMsg_Resize::Param params;
     ViewMsg_Resize::Read(msg, &params);
     EXPECT_EQ(
         "0,0 1600x1200",
         gfx::Rect(std::get<0>(params).screen_info.availableRect).ToString());
     EXPECT_EQ("1600x1200", std::get<0>(params).new_size.ToString());
     view_->OnSwapCompositorFrame(
-        0, MakeDelegatedFrame(1.f, std::get<0>(params).new_size,
-                              gfx::Rect(std::get<0>(params).new_size)));
+        0, cc::SurfaceId(1, 2, 1),
+        MakeDelegatedFrame(1.f, std::get<0>(params).new_size,
+                           gfx::Rect(std::get<0>(params).new_size)));
     ui::DrawWaiterForTest::WaitForCommit(
         root_window->GetHost()->compositor());
   }
 }
 
 // Swapping a frame should notify the window.
 TEST_F(RenderWidgetHostViewAuraTest, SwapNotifiesWindow) {
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);
 
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(),
       parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_size);
   view_->Show();
 
   MockWindowObserver observer;
   view_->window_->AddObserver(&observer);
 
   // Delegated renderer path
   EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));
-  view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, view_size, view_rect));
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1),
+                               MakeDelegatedFrame(1.f, view_size, view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
 
   EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_,
                                                gfx::Rect(5, 5, 5, 5)));
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, view_size, gfx::Rect(5, 5, 5, 5)));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, view_size, gfx::Rect(5, 5, 5, 5)));
   testing::Mock::VerifyAndClearExpectations(&observer);
 
   view_->window_->RemoveObserver(&observer);
 }
 
 // Recreating the layers for a window should cause Surface destruction to
 // depend on both layers.
 TEST_F(RenderWidgetHostViewAuraTest, RecreateLayers) {
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);
 
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(), parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_size);
   view_->Show();
 
-  view_->OnSwapCompositorFrame(0,
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1),
                                MakeDelegatedFrame(1.f, view_size, view_rect));
   std::unique_ptr<ui::LayerTreeOwner> cloned_owner(
       wm::RecreateLayers(view_->GetNativeView(), nullptr));
 
   cc::SurfaceId id = view_->GetDelegatedFrameHost()->SurfaceIdForTesting();
   if (!id.is_null()) {
     ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
     cc::SurfaceManager* manager = factory->GetSurfaceManager();
     cc::Surface* surface = manager->GetSurfaceForId(id);
     EXPECT_TRUE(surface);
@@ skipping 14 matching lines @@
 
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(), parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(large_size);
   view_->Show();
   cc::CompositorFrame frame =
       MakeDelegatedFrame(1.f, small_size, gfx::Rect(small_size));
   frame.metadata.root_background_color = SK_ColorRED;
-  view_->OnSwapCompositorFrame(0, std::move(frame));
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1), std::move(frame));
 
   ui::Layer* parent_layer = view_->GetNativeView()->layer();
 
   ASSERT_EQ(2u, parent_layer->children().size());
   EXPECT_EQ(gfx::Rect(40, 0, 60, 100), parent_layer->children()[0]->bounds());
   EXPECT_EQ(SK_ColorRED, parent_layer->children()[0]->background_color());
   EXPECT_EQ(gfx::Rect(0, 45, 40, 55), parent_layer->children()[1]->bounds());
   EXPECT_EQ(SK_ColorRED, parent_layer->children()[1]->background_color());
 
   delegates_.back()->set_is_fullscreen(true);
   view_->SetSize(medium_size);
 
   // Right gutter is unnecessary.
   ASSERT_EQ(1u, parent_layer->children().size());
   EXPECT_EQ(gfx::Rect(0, 45, 40, 50), parent_layer->children()[0]->bounds());
 
   // RWH is fullscreen, so gutters should be black.
   EXPECT_EQ(SK_ColorBLACK, parent_layer->children()[0]->background_color());
 
   frame = MakeDelegatedFrame(1.f, medium_size, gfx::Rect(medium_size));
-  view_->OnSwapCompositorFrame(0, std::move(frame));
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1), std::move(frame));
   EXPECT_EQ(0u, parent_layer->children().size());
 
   view_->SetSize(large_size);
   ASSERT_EQ(2u, parent_layer->children().size());
 
   // This should evict the frame and remove the gutter layers.
   view_->Hide();
   view_->SetSize(small_size);
   ASSERT_EQ(0u, parent_layer->children().size());
 }
 
 TEST_F(RenderWidgetHostViewAuraTest, Resize) {
   gfx::Size size1(100, 100);
   gfx::Size size2(200, 200);
   gfx::Size size3(300, 300);
 
   aura::Window* root_window = parent_view_->GetNativeView()->GetRootWindow();
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(), root_window, gfx::Rect(size1));
   view_->Show();
   view_->SetSize(size1);
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, size1, gfx::Rect(size1)));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, size1, gfx::Rect(size1)));
   ui::DrawWaiterForTest::WaitForCommit(
       root_window->GetHost()->compositor());
   ViewHostMsg_UpdateRect_Params update_params;
   update_params.view_size = size1;
   update_params.flags = ViewHostMsg_UpdateRect_Flags::IS_RESIZE_ACK;
   widget_host_->OnMessageReceived(
       ViewHostMsg_UpdateRect(widget_host_->GetRoutingID(), update_params));
   sink_->ClearMessages();
   // Resize logic is idle (no pending resize, no pending commit).
   EXPECT_EQ(size1.ToString(), view_->GetRequestedRendererSize().ToString());
@@ skipping 17 matching lines @@
 
   // Resize renderer again, before receiving a frame. Should not produce a
   // Resize message.
   view_->SetSize(size3);
   EXPECT_EQ(size2.ToString(), view_->GetRequestedRendererSize().ToString());
   EXPECT_EQ(0u, sink_->message_count());
 
   // Receive a frame of the new size, should be skipped and not produce a Resize
   // message.
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, size3, gfx::Rect(size3)));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, size3, gfx::Rect(size3)));
   // Expect the frame ack;
   EXPECT_EQ(1u, sink_->message_count());
   EXPECT_EQ(ViewMsg_ReclaimCompositorResources::ID,
             sink_->GetMessageAt(0)->type());
   sink_->ClearMessages();
   EXPECT_EQ(size2.ToString(), view_->GetRequestedRendererSize().ToString());
 
   // Receive a frame of the correct size, should not be skipped and, and should
   // produce a Resize message after the commit.
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, size2, gfx::Rect(size2)));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, size2, gfx::Rect(size2)));
   cc::SurfaceId surface_id = view_->surface_id();
   if (surface_id.is_null()) {
     // No frame ack yet.
     EXPECT_EQ(0u, sink_->message_count());
   } else {
     // Frame isn't desired size, so early ack.
     EXPECT_EQ(1u, sink_->message_count());
   }
   EXPECT_EQ(size2.ToString(), view_->GetRequestedRendererSize().ToString());
 
@@ skipping 50 matching lines @@
       view_->GetNativeView(),
       parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_rect.size());
 
   MockWindowObserver observer;
   view_->window_->AddObserver(&observer);
 
   // A full frame of damage.
   EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));
-  view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, frame_size, view_rect));
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1),
+                               MakeDelegatedFrame(1.f, frame_size, view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   // A partial damage frame.
   gfx::Rect partial_view_rect(30, 30, 20, 20);
   EXPECT_CALL(observer,
               OnDelegatedFrameDamage(view_->window_, partial_view_rect));
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, frame_size, partial_view_rect));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, partial_view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   // Lock the compositor. Now we should drop frames.
   view_rect = gfx::Rect(150, 150);
   view_->SetSize(view_rect.size());
 
   // This frame is dropped.
   gfx::Rect dropped_damage_rect_1(10, 20, 30, 40);
   EXPECT_CALL(observer, OnDelegatedFrameDamage(_, _)).Times(0);
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, frame_size, dropped_damage_rect_1));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, dropped_damage_rect_1));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   gfx::Rect dropped_damage_rect_2(40, 50, 10, 20);
   EXPECT_CALL(observer, OnDelegatedFrameDamage(_, _)).Times(0);
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, frame_size, dropped_damage_rect_2));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, dropped_damage_rect_2));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   // Unlock the compositor. This frame should damage everything.
   frame_size = view_rect.size();
 
   gfx::Rect new_damage_rect(5, 6, 10, 10);
   EXPECT_CALL(observer,
               OnDelegatedFrameDamage(view_->window_, view_rect));
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, frame_size, new_damage_rect));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, new_damage_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   // A partial damage frame, this should not be dropped.
   EXPECT_CALL(observer,
               OnDelegatedFrameDamage(view_->window_, partial_view_rect));
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, frame_size, partial_view_rect));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, partial_view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
 
   // Resize to something empty.
   view_rect = gfx::Rect(100, 0);
   view_->SetSize(view_rect.size());
 
   // We're never expecting empty frames, resize to something non-empty.
   view_rect = gfx::Rect(100, 100);
   view_->SetSize(view_rect.size());
 
   // This frame should not be dropped.
   EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));
   view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, view_rect.size(), view_rect));
+      0, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, view_rect.size(), view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   view_->window_->RemoveObserver(&observer);
 }
 
 TEST_F(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange) {
   gfx::Rect view_rect(100, 100);
   gfx::Size frame_size = view_rect.size();
 
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(),
       parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_rect.size());
 
   MockWindowObserver observer;
   view_->window_->AddObserver(&observer);
 
   // Swap a frame.
   EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));
-  view_->OnSwapCompositorFrame(
-      0, MakeDelegatedFrame(1.f, frame_size, view_rect));
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1),
+                               MakeDelegatedFrame(1.f, frame_size, view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   // Swap a frame with a different surface id.
   EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));
-  view_->OnSwapCompositorFrame(
-      1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+  view_->OnSwapCompositorFrame(1, cc::SurfaceId(1, 2, 1),
+                               MakeDelegatedFrame(1.f, frame_size, view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   // Swap an empty frame, with a different surface id.
   view_->OnSwapCompositorFrame(
-      2, MakeDelegatedFrame(1.f, gfx::Size(), gfx::Rect()));
+      2, cc::SurfaceId(1, 3, 1),
+      MakeDelegatedFrame(1.f, gfx::Size(), gfx::Rect()));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   // Swap another frame, with a different surface id.
   EXPECT_CALL(observer, OnDelegatedFrameDamage(view_->window_, view_rect));
-  view_->OnSwapCompositorFrame(3,
+  view_->OnSwapCompositorFrame(3, cc::SurfaceId(1, 4, 1),
                                MakeDelegatedFrame(1.f, frame_size, view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
   view_->RunOnCompositingDidCommit();
 
   view_->window_->RemoveObserver(&observer);
 }
 
 TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFrames) {
   view_->InitAsChild(nullptr);
 
@@ skipping 24 matching lines @@
         views[i]->GetNativeView(),
         parent_view_->GetNativeView()->GetRootWindow(),
         gfx::Rect());
     views[i]->SetSize(view_rect.size());
   }
 
   // Make each renderer visible, and swap a frame on it, then make it invisible.
   for (size_t i = 0; i < renderer_count; ++i) {
     views[i]->Show();
     views[i]->OnSwapCompositorFrame(
-        1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+        1, cc::SurfaceId(1 + i, 1, 1),
+        MakeDelegatedFrame(1.f, frame_size, view_rect));
     EXPECT_TRUE(views[i]->HasFrameData());
     views[i]->Hide();
   }
 
   // There should be max_renderer_frames with a frame in it, and one without it.
   // Since the logic is LRU eviction, the first one should be without.
   EXPECT_FALSE(views[0]->HasFrameData());
   for (size_t i = 1; i < renderer_count; ++i)
     EXPECT_TRUE(views[i]->HasFrameData());
 
   // LRU renderer is [0], make it visible, it shouldn't evict anything yet.
   views[0]->Show();
   EXPECT_FALSE(views[0]->HasFrameData());
   EXPECT_TRUE(views[1]->HasFrameData());
   // Since [0] doesn't have a frame, it should be waiting for the renderer to
   // give it one.
   EXPECT_TRUE(views[0]->released_front_lock_active());
 
   // Swap a frame on it, it should evict the next LRU [1].
   views[0]->OnSwapCompositorFrame(
-      1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+      1, cc::SurfaceId(1, 2, 1),
+      MakeDelegatedFrame(1.f, frame_size, view_rect));
   EXPECT_TRUE(views[0]->HasFrameData());
   EXPECT_FALSE(views[1]->HasFrameData());
   // Now that [0] got a frame, it shouldn't be waiting any more.
   EXPECT_FALSE(views[0]->released_front_lock_active());
   views[0]->Hide();
 
   // LRU renderer is [1], still hidden. Swap a frame on it, it should evict
   // the next LRU [2].
   views[1]->OnSwapCompositorFrame(
-      1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+      1, cc::SurfaceId(2, 2, 1),
+      MakeDelegatedFrame(1.f, frame_size, view_rect));
   EXPECT_TRUE(views[0]->HasFrameData());
   EXPECT_TRUE(views[1]->HasFrameData());
   EXPECT_FALSE(views[2]->HasFrameData());
   for (size_t i = 3; i < renderer_count; ++i)
     EXPECT_TRUE(views[i]->HasFrameData());
 
   // Make all renderers but [0] visible and swap a frame on them, keep [0]
   // hidden, it becomes the LRU.
   for (size_t i = 1; i < renderer_count; ++i) {
     views[i]->Show();
     // The renderers who don't have a frame should be waiting. The ones that
     // have a frame should not.
     // In practice, [1] has a frame, but anything after has its frame evicted.
     EXPECT_EQ(!views[i]->HasFrameData(),
               views[i]->released_front_lock_active());
     views[i]->OnSwapCompositorFrame(
-        1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+        1, cc::SurfaceId(1 + i, 1, 1),
+        MakeDelegatedFrame(1.f, frame_size, view_rect));
     // Now everyone has a frame.
     EXPECT_FALSE(views[i]->released_front_lock_active());
     EXPECT_TRUE(views[i]->HasFrameData());
   }
   EXPECT_FALSE(views[0]->HasFrameData());
 
   // Swap a frame on [0], it should be evicted immediately.
   views[0]->OnSwapCompositorFrame(
-      1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+      1, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, view_rect));
   EXPECT_FALSE(views[0]->HasFrameData());
 
   // Make [0] visible, and swap a frame on it. Nothing should be evicted
   // although we're above the limit.
   views[0]->Show();
   // We don't have a frame, wait.
   EXPECT_TRUE(views[0]->released_front_lock_active());
   views[0]->OnSwapCompositorFrame(
-      1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+      1, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, view_rect));
   EXPECT_FALSE(views[0]->released_front_lock_active());
   for (size_t i = 0; i < renderer_count; ++i)
     EXPECT_TRUE(views[i]->HasFrameData());
 
   // Make [0] hidden, it should evict its frame.
   views[0]->Hide();
   EXPECT_FALSE(views[0]->HasFrameData());
 
   // Make [0] visible, don't give it a frame, it should be waiting.
   views[0]->Show();
   EXPECT_TRUE(views[0]->released_front_lock_active());
   // Make [0] hidden, it should stop waiting.
   views[0]->Hide();
   EXPECT_FALSE(views[0]->released_front_lock_active());
 
   // Make [1] hidden, resize it. It should drop its frame.
   views[1]->Hide();
   EXPECT_TRUE(views[1]->HasFrameData());
   gfx::Size size2(200, 200);
   views[1]->SetSize(size2);
   EXPECT_FALSE(views[1]->HasFrameData());
   // Show it, it should block until we give it a frame.
   views[1]->Show();
   EXPECT_TRUE(views[1]->released_front_lock_active());
   views[1]->OnSwapCompositorFrame(
-      1, MakeDelegatedFrame(1.f, size2, gfx::Rect(size2)));
+      1, cc::SurfaceId(2, 1, 1),
+      MakeDelegatedFrame(1.f, size2, gfx::Rect(size2)));
   EXPECT_FALSE(views[1]->released_front_lock_active());
 
   for (size_t i = 0; i < renderer_count - 1; ++i)
     views[i]->Hide();
 
   // Allocate enough bitmaps so that two frames (proportionally) would be
   // enough hit the handle limit.
   int handles_per_frame = 5;
   RendererFrameManager::GetInstance()->set_max_handles(handles_per_frame * 2);
 
@@ skipping 53 matching lines @@
         parent_view_->GetNativeView()->GetRootWindow(),
         gfx::Rect());
     views[i]->SetSize(view_rect.size());
   }
 
   // Make each renderer visible and swap a frame on it. No eviction should
   // occur because all frames are visible.
   for (size_t i = 0; i < renderer_count; ++i) {
     views[i]->Show();
     views[i]->OnSwapCompositorFrame(
-        1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+        1, cc::SurfaceId(i + 1, 1, 1),
+        MakeDelegatedFrame(1.f, frame_size, view_rect));
     EXPECT_TRUE(views[i]->HasFrameData());
   }
 
   // If we hide [0], then [0] should be evicted.
   views[0]->Hide();
   EXPECT_FALSE(views[0]->HasFrameData());
 
   // If we lock [0] before hiding it, then [0] should not be evicted.
   views[0]->Show();
   views[0]->OnSwapCompositorFrame(
-        1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+      1, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, view_rect));
   EXPECT_TRUE(views[0]->HasFrameData());
   views[0]->GetDelegatedFrameHost()->LockResources();
   views[0]->Hide();
   EXPECT_TRUE(views[0]->HasFrameData());
 
   // If we unlock [0] now, then [0] should be evicted.
   views[0]->GetDelegatedFrameHost()->UnlockResources();
   EXPECT_FALSE(views[0]->HasFrameData());
 
   for (size_t i = 0; i < renderer_count; ++i) {
@@ skipping 39 matching lines @@
         parent_view_->GetNativeView()->GetRootWindow(),
         gfx::Rect());
     views[i]->SetSize(view_rect.size());
   }
 
   // Make each renderer visible and swap a frame on it. No eviction should
   // occur because all frames are visible.
   for (size_t i = 0; i < renderer_count; ++i) {
     views[i]->Show();
     views[i]->OnSwapCompositorFrame(
-        1, MakeDelegatedFrame(1.f, frame_size, view_rect));
+        1, cc::SurfaceId(1, 1, 1),
+        MakeDelegatedFrame(1.f, frame_size, view_rect));
     EXPECT_TRUE(views[i]->HasFrameData());
   }
 
   // If we hide one, it should not get evicted.
   views[0]->Hide();
   message_loop_.RunUntilIdle();
   EXPECT_TRUE(views[0]->HasFrameData());
   // Using a lesser memory pressure event however, should evict.
   SimulateMemoryPressure(
       base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE);
@@ skipping 22 matching lines @@
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(),
       parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_rect.size());
   view_->Show();
 
   // With a 1x DPI UI and 1x DPI Renderer.
   view_->OnSwapCompositorFrame(
-      1, MakeDelegatedFrame(1.f, frame_size, gfx::Rect(frame_size)));
+      1, cc::SurfaceId(1, 1, 1),
+      MakeDelegatedFrame(1.f, frame_size, gfx::Rect(frame_size)));
 
   cc::SurfaceId surface_id = view_->surface_id();
 
   // This frame will have the same number of physical pixels, but has a new
   // scale on it.
   view_->OnSwapCompositorFrame(
-      1, MakeDelegatedFrame(2.f, frame_size, gfx::Rect(frame_size)));
+      1, cc::SurfaceId(1, 2, 1),
+      MakeDelegatedFrame(2.f, frame_size, gfx::Rect(frame_size)));
 
   // When we get a new frame with the same frame size in physical pixels, but
   // a different scale, we should generate a surface, as the final result will
   // need to be scaled differently to the screen.
   EXPECT_NE(surface_id, view_->surface_id());
 }
 
 class RenderWidgetHostViewAuraCopyRequestTest
     : public RenderWidgetHostViewAuraShutdownTest {
  public:
@@ skipping 40 matching lines @@
   }
 
   void InstallFakeTickClock() {
     // Create a fake tick clock and transfer ownership to the frame host.
     tick_clock_ = new base::SimpleTestTickClock();
     view_->GetDelegatedFrameHost()->tick_clock_ = base::WrapUnique(tick_clock_);
   }
 
   void OnSwapCompositorFrame() {
     view_->OnSwapCompositorFrame(
-        1, MakeDelegatedFrame(1.f, view_rect_.size(), view_rect_));
+        1, cc::SurfaceId(1, 1, 1),
+        MakeDelegatedFrame(1.f, view_rect_.size(), view_rect_));
     cc::SurfaceId surface_id =
         view_->GetDelegatedFrameHost()->SurfaceIdForTesting();
     if (!surface_id.is_null())
       view_->GetDelegatedFrameHost()->WillDrawSurface(surface_id, view_rect_);
     ASSERT_TRUE(view_->last_copy_request_);
   }
 
   void ReleaseSwappedFrame() {
     std::unique_ptr<cc::CopyOutputRequest> request =
         std::move(view_->last_copy_request_);
@@ skipping 1453 matching lines @@
   gfx::Size size(5, 5);
 
   const IPC::Message* msg =
       sink_->GetUniqueMessageMatching(ViewMsg_SetSurfaceClientId::ID);
   EXPECT_TRUE(msg);
   ViewMsg_SetSurfaceClientId::Param params;
   ViewMsg_SetSurfaceClientId::Read(msg, &params);
   view_->InitAsChild(nullptr);
   view_->Show();
   view_->SetSize(size);
-  view_->OnSwapCompositorFrame(0,
+  view_->OnSwapCompositorFrame(0, cc::SurfaceId(1, 1, 1),
                                MakeDelegatedFrame(1.f, size, gfx::Rect(size)));
   EXPECT_EQ(view_->GetSurfaceClientId(), std::get<0>(params));
 }
 
 // This class provides functionality to test a RenderWidgetHostViewAura
 // instance which has been hooked up to a test RenderViewHost instance and
 // a WebContents instance.
 class RenderWidgetHostViewAuraWithViewHarnessTest
     : public RenderViewHostImplTestHarness {
  public:
@@ skipping 428 matching lines @@
     // No bounds at index 1.
     EXPECT_FALSE(text_input_client()->GetCompositionCharacterBounds(1, &bound));
 
     // Valid bound at index 0.
     EXPECT_TRUE(text_input_client()->GetCompositionCharacterBounds(0, &bound));
     EXPECT_EQ(4 + (int)index, bound.height());
   }
 }
 
 }  // namespace content