Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1853)

Unified Diff: content/browser/frame_host/render_widget_host_view_guest_unittest.cc

Issue 2728183002: RendererCompositorFrameSink should handle local surface id allocation (Closed)
Patch Set: rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_widget_host_view_guest_unittest.cc
diff --git a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
index a7c5e79a8ec48b031926116637a542676acb6aa3..3743a180246929fb69310cdcd79e1e94a7611992 100644
--- a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
@@ -229,6 +229,7 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {
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());
ASSERT_TRUE(browser_plugin_guest_);
@@ -237,7 +238,8 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {
browser_plugin_guest_->set_attached(true);
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();
@@ -261,7 +263,8 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {
browser_plugin_guest_->set_has_attached_since_surface_set(true);
view_->OnSwapCompositorFrame(
- 0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
+ 0, local_surface_id,
+ CreateDelegatedFrame(scale_factor, view_size, view_rect));
// Since we have not changed the frame size and scale factor, the same surface
// id must be used.
@@ -283,8 +286,8 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {
browser_plugin_guest_->ResetTestData();
view_->OnSwapCompositorFrame(
- 0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
-
+ 0, local_surface_id,
+ CreateDelegatedFrame(scale_factor, view_size, view_rect));
// Since guest is not attached, the CompositorFrame must be processed but the
// frame must be evicted to return the resources immediately.
EXPECT_FALSE(view_->has_frame());

Powered by Google App Engine
This is Rietveld 408576698