Mac: Shift more code into C++ classes from ObjC classes

content/browser/compositor/browser_compositor_view_mac.mm

 // Copyright 2014 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 "content/browser/compositor/browser_compositor_view_mac.h"
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "content/browser/compositor/browser_compositor_view_private_mac.h"
 
@@ skipping 22 matching lines @@
 @end  // NSView (BrowserCompositorView)
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserCompositorViewMac
 
 namespace content {
 namespace {
 
 // The number of placeholder objects allocated. If this reaches zero, then
 // the BrowserCompositorViewCocoa being held on to for recycling,
-// |g_recyclable_cocoa_view|, will be freed.
+// |g_recyclable_internal_view|, will be freed.
 uint32 g_placeholder_count = 0;
 
 // A spare BrowserCompositorViewCocoa kept around for recycling.
-base::LazyInstance<base::scoped_nsobject<BrowserCompositorViewCocoa>>
-  g_recyclable_cocoa_view;
+base::LazyInstance<scoped_ptr<BrowserCompositorViewMacInternal>>
+  g_recyclable_internal_view;
 
 }  // namespace
 
 BrowserCompositorViewMac::BrowserCompositorViewMac(
     BrowserCompositorViewMacClient* client) : client_(client) {
   // Try to use the recyclable BrowserCompositorViewCocoa if there is one,
   // otherwise allocate a new one.
   // TODO(ccameron): If there exists a frame in flight (swap has been called
   // by the compositor, but the frame has not arrived from the GPU process
   // yet), then that frame may inappropriately flash in the new view.
-  swap(g_recyclable_cocoa_view.Get(), cocoa_view_);
-  if (!cocoa_view_)
-    cocoa_view_.reset([[BrowserCompositorViewCocoa alloc] init]);
-  [cocoa_view_ setClient:client_];
+  internal_view_.reset(g_recyclable_internal_view.Get().release());

[miu, 2014/07/16 22:31:55]

nit: internal_view_ = g_recyclable_internal_view.Get().Pass();

[ccameron, 2014/07/17 02:30:02]

Done.

+  if (!internal_view_)
+    internal_view_.reset(new BrowserCompositorViewMacInternal);
+  internal_view_->SetClient(client_);
 }
 
 BrowserCompositorViewMac::~BrowserCompositorViewMac() {
   // Make this BrowserCompositorViewCocoa recyclable for future instances.
-  [cocoa_view_ setClient:NULL];
-  [g_recyclable_cocoa_view.Get() destroyCompositor];
-  swap(g_recyclable_cocoa_view.Get(), cocoa_view_);
+  internal_view_->ResetClient();
+  g_recyclable_internal_view.Get().reset(internal_view_.release());

[miu, 2014/07/16 22:31:55]

ditto: g_recyclable_internal_view.Get() = internal_view_.Pass();

[ccameron, 2014/07/17 02:30:01]

Done.

 
   // If there are no placeholders allocated, destroy the recyclable
   // BrowserCompositorViewCocoa that we just populated.
-  if (!g_placeholder_count) {
-    [g_recyclable_cocoa_view.Get() destroyCompositor];
-    g_recyclable_cocoa_view.Get().reset();
-  }
+  if (!g_placeholder_count)
+    g_recyclable_internal_view.Get().reset();
 }
 
 ui::Compositor* BrowserCompositorViewMac::GetCompositor() const {
-  DCHECK(cocoa_view_);
-  return [cocoa_view_ compositor];
+  DCHECK(internal_view_);
+  return internal_view_->compositor();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserCompositorViewPlaceholderMac
 
 BrowserCompositorViewPlaceholderMac::BrowserCompositorViewPlaceholderMac() {
   g_placeholder_count += 1;
 }
 
 BrowserCompositorViewPlaceholderMac::~BrowserCompositorViewPlaceholderMac() {
   DCHECK_GT(g_placeholder_count, 0u);
   g_placeholder_count -= 1;
 
   // If there are no placeholders allocated, destroy the recyclable
   // BrowserCompositorViewCocoa.
-  if (!g_placeholder_count) {
-    [g_recyclable_cocoa_view.Get() destroyCompositor];
-    g_recyclable_cocoa_view.Get().reset();
-  }
+  if (!g_placeholder_count)
+    g_recyclable_internal_view.Get().reset();
 }
 
 }  // namespace content