mus-ws: Plumb FrameSinkId to Children

ui/aura/mus/window_tree_host_mus.cc

 // Copyright 2015 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 "ui/aura/mus/window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/input_method_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
@@ skipping 24 matching lines @@
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMus, public:
 
 WindowTreeHostMus::WindowTreeHostMus(
     std::unique_ptr<WindowPortMus> window_port,
     WindowTreeClient* window_tree_client,
     int64_t display_id,
+    const cc::FrameSinkId& frame_sink_id,
     const std::map<std::string, std::vector<uint8_t>>* properties)
     : WindowTreeHostPlatform(std::move(window_port)),
       display_id_(display_id),
       delegate_(window_tree_client) {
   window()->SetProperty(kWindowTreeHostMusKey, this);
   // TODO(sky): find a cleaner way to set this! Better solution is to likely
   // have constructor take aura::Window.
-  WindowPortMus::Get(window())->window_ = window();
+  WindowPortMus* window_mus = WindowPortMus::Get(window());
+  window_mus->window_ = window();
   if (properties) {
     // Apply the properties before initializing the window, that way the
     // server seems them at the time the window is created.
-    WindowMus* window_mus = WindowMus::Get(window());
     for (auto& pair : *properties)
       window_mus->SetPropertyFromServer(pair.first, &pair.second);
   }
-  Id server_id = WindowMus::Get(window())->server_id();
-  cc::FrameSinkId frame_sink_id(server_id, 0);
-  DCHECK(frame_sink_id.is_valid());
+  // TODO(fsamuel): Once the display compositor is decoupled from the browser
+  // process then ui::Compositor will not a cc::FrameSinkId.
   CreateCompositor(frame_sink_id);
   gfx::AcceleratedWidget accelerated_widget;
   if (IsUsingTestContext()) {
     accelerated_widget = gfx::kNullAcceleratedWidget;
   } else {
 // We need accelerated widget numbers to be different for each
 // window and fit in the smallest sizeof(AcceleratedWidget) uint32_t
 // has this property.
 #if defined(OS_WIN) || defined(OS_ANDROID)
     accelerated_widget =
@@ skipping 13 matching lines @@
       false));  // Do not advertise accelerated widget; already set manually.
 
   input_method_ = base::MakeUnique<InputMethodMus>(this, window());
   input_method_->Init(window_tree_client->connector());
   SetSharedInputMethod(input_method_.get());
 
   compositor()->SetHostHasTransparentBackground(true);
 
   // Mus windows are assumed hidden.
   compositor()->SetVisible(false);
+
+  if (frame_sink_id.is_valid())
+    window_mus->SetFrameSinkIdFromServer(frame_sink_id);
 }
 
 // Pass |properties| to CreateWindowPortForTopLevel() so that |properties|
 // are passed to the server *and* pass |properties| to the WindowTreeHostMus
 // constructor (above) which applies the properties to the Window. Some of the
 // properties may be server specific and not applied to the Window.
 WindowTreeHostMus::WindowTreeHostMus(
     WindowTreeClient* window_tree_client,
+    const cc::FrameSinkId& frame_sink_id,
     const std::map<std::string, std::vector<uint8_t>>* properties)
     : WindowTreeHostMus(
           static_cast<WindowTreeHostMusDelegate*>(window_tree_client)
               ->CreateWindowPortForTopLevel(properties),
           window_tree_client,
           display::Screen::GetScreen()->GetPrimaryDisplay().id(),
+          frame_sink_id,
           properties) {}
 
 WindowTreeHostMus::~WindowTreeHostMus() {
   DestroyCompositor();
   DestroyDispatcher();
 }
 
 // static
 WindowTreeHostMus* WindowTreeHostMus::ForWindow(aura::Window* window) {
   if (!window)
@@ skipping 99 matching lines @@
 void WindowTreeHostMus::MoveCursorToScreenLocationInPixels(
     const gfx::Point& location_in_pixels) {
   // TODO: this needs to message the server http://crbug.com/693340. Setting
   // the location is really only appropriate in tests, outside of tests this
   // value is ignored.
   NOTIMPLEMENTED();
   Env::GetInstance()->set_last_mouse_location(location_in_pixels);
 }
 
 }  // namespace aura