Remove FrameGenerator::root_window_

services/ui/ws/platform_display_default.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/platform_display_default.h"
 
 #include "base/memory/ptr_util.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/display/screen_manager.h"
 #include "services/ui/ws/display_client_compositor_frame_sink.h"
@@ skipping 19 matching lines @@
 namespace ws {
 
 PlatformDisplayDefault::PlatformDisplayDefault(
     ServerWindow* root_window,
     const display::ViewportMetrics& metrics)
     : root_window_(root_window),
 #if !defined(OS_ANDROID)
       image_cursors_(new ImageCursors),
 #endif
       metrics_(metrics),
-      widget_(gfx::kNullAcceleratedWidget),
-      init_device_scale_factor_(metrics.device_scale_factor) {
+      widget_(gfx::kNullAcceleratedWidget) {
 }
 
 PlatformDisplayDefault::~PlatformDisplayDefault() {
   // Don't notify the delegate from the destructor.
   delegate_ = nullptr;
 
   frame_generator_.reset();
   // Destroy the PlatformWindow early on as it may call us back during
   // destruction and we want to be in a known state. But destroy the surface
   // first because it can still be using the platform window.
@@ skipping 75 matching lines @@
 
 bool PlatformDisplayDefault::UpdateViewportMetrics(
     const display::ViewportMetrics& metrics) {
   if (metrics_ == metrics)
     return false;
 
   gfx::Rect bounds = platform_window_->GetBounds();
   if (bounds.size() != metrics.bounds_in_pixels.size()) {
     bounds.set_size(metrics.bounds_in_pixels.size());
     platform_window_->SetBounds(bounds);
+    if (frame_generator_)
+      frame_generator_->OnWindowBoundsChanged(bounds.size());

[kylechar, 2017/03/22 21:27:36]

optional: metrics.pixel_size, or move this down into the if block below and use
metrics_.pixel_size;

[Alex Z., 2017/03/23 14:18:44]

Done.

   }
 
   metrics_ = metrics;
   if (frame_generator_)
     frame_generator_->SetDeviceScaleFactor(metrics_.device_scale_factor);
   return true;
 }
 
 gfx::AcceleratedWidget PlatformDisplayDefault::GetAcceleratedWidget() const {
   return widget_;
@@ skipping 103 matching lines @@
       widget_, mojo::MakeRequest(&compositor_frame_sink),
       std::move(compositor_frame_sink_client),
       mojo::MakeRequest(&display_private));
 
   auto display_client_compositor_frame_sink =
       base::MakeUnique<DisplayClientCompositorFrameSink>(
           root_window_->frame_sink_id(), std::move(compositor_frame_sink),
           std::move(display_private),
           std::move(compositor_frame_sink_client_request));
   frame_generator_ = base::MakeUnique<FrameGenerator>(
-      root_window_, std::move(display_client_compositor_frame_sink));
-  frame_generator_->SetDeviceScaleFactor(init_device_scale_factor_);
+      std::move(display_client_compositor_frame_sink));
+  frame_generator_->OnWindowBoundsChanged(root_window_->bounds().size());

[kylechar, 2017/03/22 21:27:36]

metrics_.pixel_size here?

[Alex Z., 2017/03/23 14:18:44]

Done.

+  frame_generator_->SetDeviceScaleFactor(metrics_.device_scale_factor);
 }
 
 void PlatformDisplayDefault::OnAcceleratedWidgetDestroyed() {
   NOTREACHED();
 }
 
 void PlatformDisplayDefault::OnActivationChanged(bool active) {}
 
 }  // namespace ws
 }  // namespace ui