ui::Compositor is no longer ref-counted

BUG=None
TEST=covered by existing tests (compositor_unittests, views_unittests, aura_unittests)


Review URL: http://codereview.chromium.org/9380045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121667 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 8 deletions

diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 193a50d..bd545ad 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -470,15 +470,15 @@ RootWindow::RootWindow()
   last_mouse_location_ = host_->QueryMouseLocation();
 
   ui::Compositor::Initialize(false);
-  compositor_ = new ui::Compositor(this, host_->GetAcceleratedWidget(),
-      host_->GetSize());
+  compositor_.reset(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;
+  compositor_.reset();
 
   // Tear down in reverse.  Frees any references held by the host.
   host_.reset(NULL);
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index 3122b53..3cfec4e 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "ui/aura/aura_export.h"
@@ -249,7 +249,7 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   // current mouse location.
   void SynthesizeMouseMoveEvent();
 
-  scoped_refptr<ui::Compositor> compositor_;
+  scoped_ptr<ui::Compositor> compositor_;
 
   scoped_ptr<RootWindowHost> host_;
 
diff --git a/ui/aura/root_window_view_mac.h b/ui/aura/root_window_view_mac.h
index b34f2d4..53eca8a 100644
--- a/ui/aura/root_window_view_mac.h
+++ b/ui/aura/root_window_view_mac.h
@@ -14,9 +14,9 @@
 // ui::Compositor delegate, setting up the NSOpenGLContext as required.
 @interface RootWindowView : NSView {
  @private
-  scoped_refptr<ui::Compositor> compositor_;
+  ui::Compositor* compositor_;
 }
--(void)setCompositor:(scoped_refptr<ui::Compositor>)compositor;
+-(void)setCompositor:(ui::Compositor*)compositor;
 @end
 
 #endif  // UI_AURA_ROOT_WINDOW_VIEW_MAC_H_
diff --git a/ui/aura/root_window_view_mac.mm b/ui/aura/root_window_view_mac.mm
index 64c3e00..a82100e 100644
--- a/ui/aura/root_window_view_mac.mm
+++ b/ui/aura/root_window_view_mac.mm
@@ -5,7 +5,7 @@
 #import "ui/aura/root_window_view_mac.h"
 
 @implementation RootWindowView
--(void)setCompositor:(scoped_refptr<ui::Compositor>)compositor {
+-(void)setCompositor:(ui::Compositor*)compositor {
   compositor_ = compositor;
 }