Always create ClientNativePixmapFactory in chrome --mash

ui/aura/env.cc

 // Copyright (c) 2012 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/env.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/input_state_lookup.h"
 #include "ui/aura/mus/mus_types.h"
 #include "ui/aura/mus/os_exchange_data_provider_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_port_local.h"
 #include "ui/events/event_target_iterator.h"
 #include "ui/events/platform/platform_event_source.h"
 
 #if defined(USE_OZONE)
+#include "ui/ozone/public/client_native_pixmap_factory_ozone.h"
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace aura {
 
 namespace {
 
 // Env is thread local so that aura may be used on multiple threads.
 base::LazyInstance<base::ThreadLocalPointer<Env>>::Leaky lazy_tls_ptr =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 146 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
 Env::Env(Mode mode)
     : mode_(mode),
       mouse_button_flags_(0),
       is_touch_down_(false),
       get_last_mouse_location_from_mus_(mode_ == Mode::MUS),
       input_state_lookup_(InputStateLookup::Create()),
+#if defined(USE_OZONE)
+      native_pixmap_factory_(ui::CreateClientNativePixmapFactoryOzone()),
+#endif
       context_factory_(nullptr),
       context_factory_private_(nullptr) {
   DCHECK(lazy_tls_ptr.Pointer()->Get() == NULL);
   lazy_tls_ptr.Pointer()->Set(this);
 }
 
 void Env::Init() {

[sky, 2017/04/07 23:23:19]

Be aware that some tests reset the mode after the fact. This is generally only
for going from local to mus.

[rjkroege, 2017/04/10 16:21:42]

I don't understand what you mean. They do this by destructing the aura::Env
instance?

   if (RunningInsideMus()) {
     EnableMusOSExchangeDataProvider();
+#if defined(USE_OZONE)
+    // Required by all Aura-using clients of services/ui
+    gfx::ClientNativePixmapFactory::SetInstance(native_pixmap_factory_.get());
+#endif
     return;
   }
 
 #if defined(USE_OZONE)
   // The ozone platform can provide its own event source. So initialize the
   // platform before creating the default event source. If running inside mus
   // let the mus process initialize ozone instead.
   ui::OzonePlatform::InitializeForUI();
+  gfx::ClientNativePixmapFactory::SetInstance(native_pixmap_factory_.get());

[sky, 2017/04/07 23:23:20]

SetInstance(null) in the destructor?

[rjkroege, 2017/04/10 16:21:42]

Done.

 #endif
   if (!ui::PlatformEventSource::GetInstance())
     event_source_ = ui::PlatformEventSource::CreateDefault();
 }
 
 void Env::EnableMusOSExchangeDataProvider() {
   if (!is_os_exchange_data_provider_factory_) {
     ui::OSExchangeDataProviderFactory::SetFactory(this);
     is_os_exchange_data_provider_factory_ = true;
   }
@@ skipping 36 matching lines @@
 ui::EventTargeter* Env::GetEventTargeter() {
   NOTREACHED();
   return NULL;
 }
 
 std::unique_ptr<ui::OSExchangeData::Provider> Env::BuildProvider() {
   return base::MakeUnique<aura::OSExchangeDataProviderMus>();
 }
 
 }  // namespace aura