Hide compositor_frame_sink_id from RenderWidgetHostView*

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 153 matching lines @@
 #endif
 
 TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_VisibilityTest) {
   view_->Show();
   ASSERT_TRUE(view_->IsShowing());
 
   view_->Hide();
   ASSERT_FALSE(view_->IsShowing());
 }
 
-// Verify that OnSwapCompositorFrame behavior is correct when a delegated
+// Verify that SubmitCompositorFrame 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, local_surface_id,
+  view_->SubmitCompositorFrame(
+      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);
@@ skipping 11 matching lines @@
 // 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.
-  view_->OnSwapCompositorFrame(
-      0, kArbitraryLocalSurfaceId,
+  view_->SubmitCompositorFrame(
+      kArbitraryLocalSurfaceId,
       CreateDelegatedFrame(scale_factor, view_size, view_rect));
 
   EXPECT_EQ(kArbitraryLocalSurfaceId, GetLocalSurfaceId());
   EXPECT_TRUE(view_->has_frame());
 
   // Evict the frame. has_frame() should return false.
   ClearCompositorSurfaceIfNecessary();
   EXPECT_EQ(kArbitraryLocalSurfaceId, GetLocalSurfaceId());
   EXPECT_FALSE(view_->has_frame());
 
   // Submit another frame with the same local surface id. The same id should be
   // usable.
-  view_->OnSwapCompositorFrame(
-      0, kArbitraryLocalSurfaceId,
+  view_->SubmitCompositorFrame(
+      kArbitraryLocalSurfaceId,
       CreateDelegatedFrame(scale_factor, view_size, view_rect));
   EXPECT_EQ(kArbitraryLocalSurfaceId, GetLocalSurfaceId());
   EXPECT_TRUE(view_->has_frame());
 }
 
 // Tests that BeginFrameAcks are forwarded correctly from the
 // SwapCompositorFrame and OnBeginFrameDidNotSwap IPCs through the
 // CompositorFrameSinkSupport.
 TEST_F(RenderWidgetHostViewChildFrameTest, ForwardsBeginFrameAcks) {
   gfx::Size view_size(100, 100);
@@ skipping 13 matching lines @@
   {
     cc::BeginFrameArgs args =
         cc::CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, source_id, 5u);
     source.TestOnBeginFrame(args);
 
     // Ack from CompositorFrame is forwarded.
     cc::BeginFrameAck ack(source_id, 5, 4, true);
     cc::CompositorFrame frame =
         CreateDelegatedFrame(scale_factor, view_size, view_rect);
     frame.metadata.begin_frame_ack = ack;
-    view_->OnSwapCompositorFrame(0, kArbitraryLocalSurfaceId, std::move(frame));
+    view_->SubmitCompositorFrame(kArbitraryLocalSurfaceId, std::move(frame));
     EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get()));
   }
 
   {
     cc::BeginFrameArgs args =
         cc::CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, source_id, 6u);
     source.TestOnBeginFrame(args);
 
     // Explicit ack through OnBeginFrameDidNotSwap is forwarded.
     cc::BeginFrameAck ack(source_id, 6, 4, false);
     view_->OnBeginFrameDidNotSwap(ack);
     EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get()));
   }
 
   view_->SetNeedsBeginFrames(false);
 }
 
 }  // namespace content