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

content/browser/compositor/browser_compositor_view_mac.h

 // 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.
 
 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_
 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <IOSurface/IOSurfaceAPI.h>
 #include <vector>
 
 #include "base/mac/scoped_nsobject.h"
 #include "cc/output/software_frame_data.h"
 #include "content/browser/renderer_host/compositing_iosurface_layer_mac.h"
 #include "content/browser/renderer_host/software_layer_mac.h"
 #include "skia/ext/platform_canvas.h"
 #include "ui/compositor/compositor.h"
 #include "ui/events/latency_info.h"
 #include "ui/gfx/geometry/size.h"
 
-@class BrowserCompositorViewCocoa;
-
 // Additions to the NSView interface for compositor frames.
 @interface NSView (BrowserCompositorView)
 - (void)gotAcceleratedIOSurfaceFrame:(IOSurfaceID)surface_handle
                  withOutputSurfaceID:(int)surface_id
                      withLatencyInfo:(std::vector<ui::LatencyInfo>) latency_info
                        withPixelSize:(gfx::Size)pixel_size
                      withScaleFactor:(float)scale_factor;
 
 - (void)gotSoftwareFrame:(cc::SoftwareFrameData*)frame_data
          withScaleFactor:(float)scale_factor
               withCanvas:(SkCanvas*)canvas;
 @end  // NSView (BrowserCompositorView)
 
 
 namespace content {
 
+class BrowserCompositorViewMacInternal;
+
 // The interface through which BrowserCompositorViewMac calls back into
 // RenderWidgetHostViewMac (or any other structure that wishes to draw a
 // NSView backed by a ui::Compositor).
 class BrowserCompositorViewMacClient {
  public:
   // Called when a frame is drawn, and used to pass latency info back to the
   // renderer (if any).
   virtual void BrowserCompositorViewFrameSwapped(
       const std::vector<ui::LatencyInfo>& latency_info) = 0;
 
@@ skipping 18 matching lines @@
   ~BrowserCompositorViewMac();
 
   // The ui::Compositor being used to render the NSView.
   ui::Compositor* GetCompositor() const;
 
   // The client (used by the BrowserCompositorViewCocoa to access the client).
   BrowserCompositorViewMacClient* GetClient() const { return client_; }
 
  private:
   BrowserCompositorViewMacClient* client_;
-  base::scoped_nsobject<BrowserCompositorViewCocoa> cocoa_view_;
+  scoped_ptr<BrowserCompositorViewMacInternal> internal_view_;
 };
 
 // A class to keep around whenever a BrowserCompositorViewMac may be created.
 // While at least one instance of this class exists, a spare
 // BrowserCompositorViewCocoa will be kept around to be recycled so that the
 // next BrowserCompositorViewMac to be created will be be created quickly.
 class BrowserCompositorViewPlaceholderMac {
  public:
   BrowserCompositorViewPlaceholderMac();
   ~BrowserCompositorViewPlaceholderMac();
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_