Commit 53201f58 authored by Chris Blume's avatar Chris Blume Committed by Commit Bot

Render Widget to use default LSI

Previously, ParentLocalSurfaceIdAllocator would default to an invalid
LocalSurfaceId. A new LSI had to be explicitly allocated before the
normal behavior could use it.

With ParentLocalSurfaceIdAllocator now default initializing a valid LSI,
the various call sites no longer need to explicitly check for the
uninitialized state.

Render Widget is one of those call sites.

BUG=837030

Change-Id: I330d2c47492f1ac577a928f20a8e8e4e14f91b29
Reviewed-on: https://chromium-review.googlesource.com/1038127
Commit-Queue: Chris Blume <cblume@chromium.org>
Reviewed-by: default avatarFady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585361}
parent 9279c680
...@@ -282,7 +282,7 @@ TEST_F(RenderWidgetHostViewChildFrameTest, WasResizedOncePerChange) { ...@@ -282,7 +282,7 @@ TEST_F(RenderWidgetHostViewChildFrameTest, WasResizedOncePerChange) {
constexpr gfx::Size compositor_viewport_pixel_size(100, 100); constexpr gfx::Size compositor_viewport_pixel_size(100, 100);
constexpr gfx::Rect screen_space_rect(compositor_viewport_pixel_size); constexpr gfx::Rect screen_space_rect(compositor_viewport_pixel_size);
viz::ParentLocalSurfaceIdAllocator allocator; viz::ParentLocalSurfaceIdAllocator allocator;
viz::LocalSurfaceId local_surface_id = allocator.GenerateId(); viz::LocalSurfaceId local_surface_id = allocator.GetCurrentLocalSurfaceId();
constexpr viz::FrameSinkId frame_sink_id(1, 1); constexpr viz::FrameSinkId frame_sink_id(1, 1);
const viz::SurfaceId surface_id(frame_sink_id, local_surface_id); const viz::SurfaceId surface_id(frame_sink_id, local_surface_id);
......
...@@ -70,7 +70,8 @@ TEST_F(RenderWidgetTest, OnSynchronizeVisualProperties) { ...@@ -70,7 +70,8 @@ TEST_F(RenderWidgetTest, OnSynchronizeVisualProperties) {
render_thread_->sink().ClearMessages(); render_thread_->sink().ClearMessages();
viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator; viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator;
gfx::Size size(100, 100); gfx::Size size(100, 100);
visual_properties.local_surface_id = local_surface_id_allocator.GenerateId(); visual_properties.local_surface_id =
local_surface_id_allocator.GetCurrentLocalSurfaceId();
visual_properties.new_size = size; visual_properties.new_size = size;
visual_properties.compositor_viewport_pixel_size = size; visual_properties.compositor_viewport_pixel_size = size;
OnSynchronizeVisualProperties(visual_properties); OnSynchronizeVisualProperties(visual_properties);
...@@ -98,23 +99,18 @@ TEST_F(RenderWidgetTest, OnSynchronizeVisualProperties) { ...@@ -98,23 +99,18 @@ TEST_F(RenderWidgetTest, OnSynchronizeVisualProperties) {
} }
class RenderWidgetInitialSizeTest : public RenderWidgetTest { class RenderWidgetInitialSizeTest : public RenderWidgetTest {
public:
RenderWidgetInitialSizeTest() : RenderWidgetTest(), initial_size_(200, 100) {
local_surface_id_ = local_surface_id_allocator_.GenerateId();
}
protected: protected:
std::unique_ptr<VisualProperties> InitialVisualProperties() override { std::unique_ptr<VisualProperties> InitialVisualProperties() override {
std::unique_ptr<VisualProperties> initial_visual_properties( std::unique_ptr<VisualProperties> initial_visual_properties(
new VisualProperties()); new VisualProperties());
initial_visual_properties->new_size = initial_size_; initial_visual_properties->new_size = initial_size_;
initial_visual_properties->compositor_viewport_pixel_size = initial_size_; initial_visual_properties->compositor_viewport_pixel_size = initial_size_;
initial_visual_properties->local_surface_id = local_surface_id_; initial_visual_properties->local_surface_id =
local_surface_id_allocator_.GetCurrentLocalSurfaceId();
return initial_visual_properties; return initial_visual_properties;
} }
gfx::Size initial_size_; gfx::Size initial_size_ = gfx::Size(200, 100);
viz::LocalSurfaceId local_surface_id_;
viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator_; viz::ParentLocalSurfaceIdAllocator local_surface_id_allocator_;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment