Move display_ From CompositorFrameSinkSupport To GpuDisplayCompositorFrameSink

services/ui/ws/frame_generator.cc

 // Copyright 2016 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 "services/ui/ws/frame_generator.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/containers/adapters.h"
@@ skipping 71 matching lines @@
   cc::CompositorFrame frame(GenerateCompositorFrame(root_window_->bounds()));
 
   if (compositor_frame_sink_) {
     gfx::Size frame_size = last_submitted_frame_size_;
     if (!frame.render_pass_list.empty())
       frame_size = frame.render_pass_list[0]->output_rect.size();
 
     if (!local_surface_id_.is_valid() ||
         frame_size != last_submitted_frame_size_) {
       local_surface_id_ = id_allocator_.GenerateId();
+      display_private_->SetLocalSurfaceId(local_surface_id_,

[danakj, 2017/02/08 21:54:40]

DirectCompositorFrameSink::SubmitCompositorFrame doesn't do this only when the
size changes. Why the inconsistency?

[Alex Z., 2017/02/08 22:07:52]

I wanted to only do this when local surface id changes.
I'll move it out to be consistent with DirectCompositorFrameSink.

[danakj, 2017/02/08 23:31:16]

Well.. we shouldn't do work we don't need to but I want to understand what is
different here. Why does DirectCompositorFrameSink need to do this when resize
didn't happen but this doesn't? We can document this with comments.

[Alex Z., 2017/02/10 19:44:35]

Display::SetLocalSurfaceId() checks at the beginning and early 
returns if neither local_surface_id_ nor device_scale_factor_ has
changed.

+                                          frame.metadata.device_scale_factor);
       display_private_->ResizeDisplay(frame_size);
     }
 
     compositor_frame_sink_->SubmitCompositorFrame(local_surface_id_,
                                                   std::move(frame));
     compositor_frame_sink_->SetNeedsBeginFrame(false);
     last_submitted_frame_size_ = frame_size;
   }
 }
 
@@ skipping 74 matching lines @@
               0 /* sorting-context_id */);
   auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   quad->SetAll(sqs, bounds_at_origin /* rect */, gfx::Rect() /* opaque_rect */,
                bounds_at_origin /* visible_rect */, true /* needs_blending*/,
                window_manager_surface_info_.id());
 }
 
 }  // namespace ws
 
 }  // namespace ui