Merge Compositor and CompositorCC

ui/aura/root_window.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/root_window.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/gestures/gesture_recognizer.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/compositor/compositor_cc.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 
 using std::string;
 using std::vector;
 
 namespace aura {
 
 namespace {
 
@@ skipping 390 matching lines @@
       mouse_moved_handler_(NULL),
       focused_window_(NULL),
       touch_event_handler_(NULL),
       gesture_handler_(NULL),
       gesture_recognizer_(GestureRecognizer::Create()),
       synthesize_mouse_move_(false) {
   SetName("RootWindow");
   gfx::Screen::SetInstance(screen_);
   last_mouse_location_ = host_->QueryMouseLocation();
 
-  ui::CompositorCC::Initialize(false);
-  compositor_ = ui::Compositor::Create(this, host_->GetAcceleratedWidget(),
+  ui::Compositor::Initialize(false);
+  compositor_ = new ui::Compositor(this, host_->GetAcceleratedWidget(),
       host_->GetSize());
   DCHECK(compositor_.get());
 }
 
 RootWindow::~RootWindow() {
   // Make sure to destroy the compositor before terminating so that state is
   // cleared and we don't hit asserts.
   compositor_ = NULL;
   // An observer may have been added by an animation on the RootWindow.
   layer()->GetAnimator()->RemoveObserver(this);
-  ui::CompositorCC::Terminate();
+  ui::Compositor::Terminate();
   if (instance_ == this)
     instance_ = NULL;
 }
 
 void RootWindow::HandleMouseMoved(const MouseEvent& event, Window* target) {
   if (target == mouse_moved_handler_)
     return;
 
   // Send an exited event.
   if (mouse_moved_handler_ && mouse_moved_handler_->delegate()) {
@@ skipping 283 matching lines @@
   // TODO(derat|oshima): Don't use mouse_button_flags_ as it's
   // is currently broken. See/ crbug.com/107931.
   MouseEvent event(ui::ET_MOUSE_MOVED,
                    orig_mouse_location,
                    orig_mouse_location,
                    0);
   DispatchMouseEvent(&event);
 }
 
 }  // namespace aura