p1 mus+ash chrome renders ui and content

ui/views/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/views/mus/window_tree_host_mus.h"
 
+#include "components/bitmap_uploader/bitmap_uploader.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/base/view_prop.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/views/mus/input_method_mus.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/surface_context_factory.h"
 #include "ui/views/mus/window_manager_connection.h"
 
 namespace views {
 namespace {
 
+static uint32_t widget_counter = 1;

[sky, 2015/11/13 16:24:25]

nit: accelerated_widget_count.

[rjkroege, 2015/11/13 23:00:12]

Done.

+
 void WindowManagerCallback(mus::mojom::WindowManagerErrorCode error_code) {}
 
 class PlatformWindowMus : public ui::PlatformWindow,
                           public mus::WindowObserver {
  public:
   PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
             mus::Window* mus_window)
       : delegate_(delegate),
         mus_window_(mus_window),
         show_state_(mus::mojom::SHOW_STATE_RESTORED) {
     DCHECK(delegate_);
     DCHECK(mus_window_);
     mus_window_->AddObserver(this);
 
-    delegate_->OnAcceleratedWidgetAvailable(gfx::kNullAcceleratedWidget,
+    // We need accelerated widget numbers to be different for each
+    // window and fit in the smallest sizeof(AcceleratedWidget) uint32_t
+    // has this property.
+    delegate_->OnAcceleratedWidgetAvailable(
+        static_cast<gfx::AcceleratedWidget>(widget_counter++),
         mus_window_->viewport_metrics().device_pixel_ratio);
   }
 
   ~PlatformWindowMus() override {
     if (!mus_window_)
       return;
     mus_window_->RemoveObserver(this);
     mus_window_->Destroy();
   }
 
@@ skipping 112 matching lines @@
                                      mus::mojom::SurfaceType surface_type)
     : native_widget_(native_widget),
       show_state_(ui::PLATFORM_WINDOW_STATE_UNKNOWN) {
   context_factory_.reset(
       new SurfaceContextFactory(shell, window, surface_type));
   // WindowTreeHost creates the compositor using the ContextFactory from
   // aura::Env. Install |context_factory_| there so that |context_factory_| is
   // picked up.
   ui::ContextFactory* default_context_factory =
       aura::Env::GetInstance()->context_factory();
-  aura::Env::GetInstance()->set_context_factory(context_factory_.get());
+
+  // For Chrome, we need the GpuProcessTransportFactory so that renderer and
+  // browser pixels are composited into a single backing
+  // SoftwareOutputDeviceMus.
+  if (!default_context_factory) {
+    aura::Env::GetInstance()->set_context_factory(context_factory_.get());
+  }
+
   SetPlatformWindow(make_scoped_ptr(new PlatformWindowMus(this, window)));
   compositor()->SetHostHasTransparentBackground(true);
   aura::Env::GetInstance()->set_context_factory(default_context_factory);
-  DCHECK_EQ(context_factory_.get(), compositor()->context_factory());
+
+  bitmap_uploader_.reset(new bitmap_uploader::BitmapUploader(window));

[sky, 2015/11/13 16:24:25]

Why does this code have to create BitmapUploader? Can't SoftwareOutputDeviceMus
do that?

[rjkroege, 2015/11/13 23:00:12]

fwiw, my rationale for building it here went like this:

-  we need the mojo::Shell and mus::Window to build a BitmapUploader
-  SoftwareOutputDevice gets only a Compositor instance as a construction
argument
-  the cc instance must have the GpuProcessTransportFactory instance as its
ContextProvider or it doesn't draw
-  I didn't want to do a much larger refactor of ContextProvider et al. to make
the mojo shell available from cc's ContextProvider
-  I didn't want to have view props for the mojo::Shell and mus::Window

But maybe that's bad reasoning? I couldn't find a good way to get the
mojo::Shell from inside SoftwareOutputDeviceMus. Is there one? Is it better to
have two ViewProps. 

+  bitmap_uploader_->Init(shell);
+  prop_.reset(
+      new ui::ViewProp(GetAcceleratedWidget(),
+                       bitmap_uploader::kBitmapUploaderForAcceleratedWidget,
+                       bitmap_uploader_.get()));
 
   input_method_.reset(new InputMethodMUS(this, window));
   SetSharedInputMethod(input_method_.get());
 }
 
 WindowTreeHostMus::~WindowTreeHostMus() {
   DestroyCompositor();
   DestroyDispatcher();
 }
 
@@ skipping 19 matching lines @@
   if (active)
     GetInputMethod()->OnFocus();
   else
     GetInputMethod()->OnBlur();
   if (native_widget_)
     native_widget_->OnActivationChanged(active);
   WindowTreeHostPlatform::OnActivationChanged(active);
 }
 
 }  // namespace views