FrameGenerator should receive SurfaceInfo and use it in frame generation

services/ui/ws/window_server.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 "services/ui/ws/window_server.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 769 matching lines @@
     return;
 
   // Cache the last submitted surface ID in the window server.
   // DisplayCompositorFrameSink may submit a CompositorFrame without
   // creating a CompositorFrameSinkManager.
   window->GetOrCreateCompositorFrameSinkManager()->SetLatestSurfaceInfo(
       surface_info);
 
   // FrameGenerator will add an appropriate reference for the new surface.
   DCHECK(display_manager_->GetDisplayContaining(window));
-  display_manager_->GetDisplayContaining(window)
-      ->platform_display()
-      ->GetFrameGenerator()
-      ->OnSurfaceCreated(surface_info.id(), window);
+  auto display = display_manager_->GetDisplayContaining(window);
+  if (window == display->GetActiveRootWindow()) {
+    display->platform_display()->GetFrameGenerator()->OnSurfaceCreated(
+        surface_info);
+  }
 
   // This is only used for testing to observe that a window has a
   // CompositorFrame.
   if (!window_paint_callback_.is_null())
     window_paint_callback_.Run(window);
 
   if (!window->parent())
     return;
 
   WindowTree* window_tree = GetTreeWithId(window->parent()->id().client_id);
   if (window_tree)
     window_tree->ProcessWindowSurfaceChanged(window, surface_info);
 }
 
 void WindowServer::OnActiveUserIdChanged(const UserId& previously_active_id,
                                          const UserId& active_id) {
 }
 
 void WindowServer::OnUserIdAdded(const UserId& id) {
   activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
 }
 
 void WindowServer::OnUserIdRemoved(const UserId& id) {
   activity_monitor_map_.erase(id);
 }
 
 }  // namespace ws
 }  // namespace ui