ui/compositor: move the browser compositor thread to the ContextFactory

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 "ui/aura/env_observer.h"
 #include "ui/aura/input_state_lookup.h"
 #include "ui/compositor/compositor.h"

[sky, 2014/05/08 22:37:13]

If you can, remove this include.

[piman, 2014/05/08 22:48:34]

Done.

 #include "ui/events/event_target_iterator.h"
 #include "ui/events/platform/platform_event_source.h"
 
 namespace aura {
 
 // static
 Env* Env::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, public:
 
 Env::Env()
     : mouse_button_flags_(0),
       is_touch_down_(false),
       input_state_lookup_(InputStateLookup::Create().Pass()) {
 }
 
 Env::~Env() {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnWillDestroyEnv());
-
-  ui::Compositor::Terminate();
 }
 
 //static
 void Env::CreateInstance(bool create_event_source) {
   if (!instance_) {
     instance_ = new Env;
     instance_->Init(create_event_source);
   }
 }
 
@@ skipping 20 matching lines @@
 
 bool Env::IsMouseButtonDown() const {
   return input_state_lookup_.get() ? input_state_lookup_->IsMouseButtonDown() :
       mouse_button_flags_ != 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
 void Env::Init(bool create_event_source) {
-  ui::Compositor::Initialize();
-
   if (create_event_source && !ui::PlatformEventSource::GetInstance())
     event_source_ = ui::PlatformEventSource::CreateDefault();
 }
 
 void Env::NotifyWindowInitialized(Window* window) {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window));
 }
 
 void Env::NotifyHostInitialized(WindowTreeHost* host) {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnHostInitialized(host));
@@ skipping 17 matching lines @@
 scoped_ptr<ui::EventTargetIterator> Env::GetChildIterator() const {
   return scoped_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Env::GetEventTargeter() {
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace aura