MultiMonitor support

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 <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 50 matching lines @@
     case ui::ET_GESTURE_TAP:
       return NULL;
     default:
       return target;
   }
 }
 
 }  // namespace
 
 RootWindow* RootWindow::instance_ = NULL;
-bool RootWindow::use_fullscreen_host_window_ = false;
 bool RootWindow::hide_host_cursor_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, public:
 
-RootWindow::RootWindow()
+RootWindow::RootWindow(const gfx::Rect& initial_bounds)
     : Window(NULL),
-      host_(aura::RootWindowHost::Create(GetInitialHostWindowBounds())),
+      host_(aura::RootWindowHost::Create(initial_bounds)),
       ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)),
       mouse_button_flags_(0),
       last_cursor_(kCursorNull),
       cursor_shown_(true),
       capture_window_(NULL),
       mouse_pressed_handler_(NULL),
       mouse_moved_handler_(NULL),
       focused_window_(NULL),
       touch_event_handler_(NULL),
       gesture_handler_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           gesture_recognizer_(GestureRecognizer::Create(this))),
       synthesize_mouse_move_(false),
       waiting_on_compositing_end_(false),
       draw_on_compositing_end_(false),
       defer_draw_scheduling_(false),
       mouse_move_hold_count_(0),
       should_hold_mouse_moves_(false),
       release_mouse_moves_after_draw_(false) {
   SetName("RootWindow");
   last_mouse_location_ = host_->QueryMouseLocation();
 
   should_hold_mouse_moves_ = !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAuraDisableHoldMouseMoves);
 
-  ui::Compositor::Initialize(false);
   compositor_.reset(new ui::Compositor(this, host_->GetAcceleratedWidget(),
       host_->GetBounds().size()));
   DCHECK(compositor_.get());
   compositor_->AddObserver(this);
   Init();
 }
 
 RootWindow::~RootWindow() {
   compositor_->RemoveObserver(this);
   // Make sure to destroy the compositor before terminating so that state is
   // cleared and we don't hit asserts.
   compositor_.reset();
 
   // Tear down in reverse.  Frees any references held by the host.
   host_.reset(NULL);
 
   // An observer may have been added by an animation on the RootWindow.
   layer()->GetAnimator()->RemoveObserver(this);
-  ui::Compositor::Terminate();
   if (instance_ == this)

[piman, 2012/03/20 00:31:37]

Should this go away now that we can have more than one RootWindow?

[oshima, 2012/03/20 02:29:58]

looks like this is obsolete code. deleted.

     instance_ = NULL;
 }
 
 void RootWindow::ShowRootWindow() {
   host_->Show();
 }
 
 void RootWindow::SetHostSize(const gfx::Size& size) {
   DispatchHeldMouseMove();
   gfx::Rect bounds = host_->GetBounds();
   bounds.set_size(size);
   host_->SetBounds(bounds);
   // Requery the location to constrain it within the new root window size.
   last_mouse_location_ = host_->QueryMouseLocation();
   synthesize_mouse_move_ = false;
 }
 
 gfx::Size RootWindow::GetHostSize() const {
   gfx::Rect rect(host_->GetBounds().size());
   layer()->transform().TransformRect(&rect);
   return rect.size();
 }
 
+void RootWindow::SetHostBounds(const gfx::Rect& bounds) {
+  DispatchHeldMouseMove();
+  host_->SetBounds(bounds);
+  // Requery the location to constrain it within the new root window size.
+  last_mouse_location_ = host_->QueryMouseLocation();
+  synthesize_mouse_move_ = false;
+}
+
 void RootWindow::SetCursor(gfx::NativeCursor cursor) {
   last_cursor_ = cursor;
   // A lot of code seems to depend on NULL cursors actually showing an arrow,
   // so just pass everything along to the host.
   host_->SetCursor(cursor);
 }
 
 void RootWindow::ShowCursor(bool show) {
   cursor_shown_ = show;
   host_->ShowCursor(show);
@@ skipping 270 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, Window overrides:
 
 RootWindow* RootWindow::GetRootWindow() {
   return this;
 }
 
+const RootWindow* RootWindow::GetRootWindow() const {
+  return this;
+}
+
 void RootWindow::SetTransform(const ui::Transform& transform) {
   Window::SetTransform(transform);
 
   // If the layer is not animating, then we need to update the host size
   // immediately.
   if (!layer()->GetAnimator()->is_animating())
     OnHostResized(host_->GetBounds().size());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 377 matching lines @@
 void RootWindow::DispatchHeldMouseMove() {
   if (held_mouse_move_.get()) {
     // If a mouse move has been synthesized, the target location is suspect,
     // so drop the held event.
     if (!synthesize_mouse_move_)
       DispatchMouseEventImpl(held_mouse_move_.get());
     held_mouse_move_.reset();
   }
 }
 
-gfx::Rect RootWindow::GetInitialHostWindowBounds() const {
-  return Env::GetInstance()->monitor_manager()->
-      GetMonitorNearestWindow(this)->bounds();
-}
-
 void RootWindow::PostMouseMoveEventAfterWindowChange() {
   if (synthesize_mouse_move_)
     return;
   synthesize_mouse_move_ = true;
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&RootWindow::SynthesizeMouseMoveEvent,
                  event_factory_.GetWeakPtr()));
 }
 
@@ skipping 10 matching lines @@
   // is currently broken. See/ crbug.com/107931.
   MouseEvent event(ui::ET_MOUSE_MOVED,
                    orig_mouse_location,
                    orig_mouse_location,
                    ui::EF_IS_SYNTHESIZED);
   DispatchMouseEvent(&event);
 #endif
 }
 
 }  // namespace aura