Create an AcceleratedWidgetMac

content/browser/renderer_host/render_widget_host_view_mac.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <IOSurface/IOSurfaceAPI.h>
 #include <list>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
+#include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"
 #include "content/browser/compositor/browser_compositor_view_mac.h"
 #include "content/browser/compositor/delegated_frame_host.h"
 #include "content/browser/compositor/io_surface_layer_mac.h"
 #include "content/browser/renderer_host/display_link_mac.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/software_frame_manager.h"
 #include "content/common/content_export.h"
 #include "content/common/cursors/webcursor.h"
 #include "content/common/edit_command.h"
 #import "content/public/browser/render_widget_host_view_mac_base.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "ui/base/cocoa/base_view.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #include "ui/gfx/display_observer.h"
 
 namespace content {
-class BrowserCompositorviewMac;
 class RenderWidgetHostViewMac;
 class RenderWidgetHostViewMacEditCommandHelper;
 class WebContents;
 }
 
 namespace ui {
 class Compositor;
 class Layer;
 }
 
@@ skipping 150 matching lines @@
 //  Comment excerpted from render_widget_host.h:
 //
 //    "The lifetime of the RenderWidgetHost* is tied to the render process.
 //     If the render process dies, the RenderWidgetHost* goes away and all
 //     references to it must become NULL."
 //
 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h.
 class CONTENT_EXPORT RenderWidgetHostViewMac
     : public RenderWidgetHostViewBase,
       public DelegatedFrameHostClient,
-      public BrowserCompositorViewMacClient,
+      public AcceleratedWidgetMacNSView,
       public IPC::Sender,
       public gfx::DisplayObserver {
  public:
   // The view will associate itself with the given widget. The native view must
   // be hooked up immediately to the view hierarchy, or else when it is
   // deleted it will delete this out from under the caller.
   //
   // When |is_guest_view_hack| is true, this view isn't really the view for
   // the |widget|, a RenderWidgetHostViewGuest is.
   // TODO(lazyboy): Remove |is_guest_view_hack| once BrowserPlugin has migrated
@@ skipping 154 matching lines @@
   // someone (other than superview) has retained |cocoa_view_|.
   RenderWidgetHostImpl* render_widget_host_;
 
   // Current text input type.
   ui::TextInputType text_input_type_;
   bool can_compose_inline_;
 
   // The background CoreAnimation layer which is hosted by |cocoa_view_|.
   base::scoped_nsobject<CALayer> background_layer_;
 
-  // The state of |delegated_frame_host_| and |browser_compositor_view_| to
+  // The state of |delegated_frame_host_| and |browser_compositor_| to
   // manage being visible, hidden, or occluded.
   enum BrowserCompositorViewState {
     // Effects:
-    // - |browser_compositor_view_| exists and |delegated_frame_host_| is
+    // - |browser_compositor_| exists and |delegated_frame_host_| is
     //    visible.
     // Happens when:
     // - |render_widet_host_| is in the visible state (this includes when
     //   the tab isn't visible, but tab capture is enabled).
     BrowserCompositorActive,
     // Effects:
-    // - |browser_compositor_view_| exists, but |delegated_frame_host_| has
+    // - |browser_compositor_| exists, but |delegated_frame_host_| has
     //   been hidden.
     // Happens when:
     // - The |render_widget_host_| is hidden, but |cocoa_view_| is still in the
     //   NSWindow hierarchy.
     // - This happens when |cocoa_view_| is hidden (minimized, on another
-    //   occluded by other windows, etc). The |browser_compositor_view_| and
+    //   occluded by other windows, etc). The |browser_compositor_| and
     //   its CALayers are kept around so that we will have content to show when
     //   we are un-occluded.
     BrowserCompositorSuspended,
     // Effects:
-    // - |browser_compositor_view_| has been destroyed and
+    // - |browser_compositor_| has been destroyed and
     //   |delegated_frame_host_| has been hidden.
     // Happens when:
     // - The |render_widget_host_| is hidden or dead, and |cocoa_view_| is not
     //   attached to a NSWindow.
     // - This happens for backgrounded tabs.
     BrowserCompositorDestroyed,
   };
   BrowserCompositorViewState browser_compositor_state_;
 
   // Delegated frame management and compositior.
   scoped_ptr<DelegatedFrameHost> delegated_frame_host_;
   scoped_ptr<ui::Layer> root_layer_;
 
-  // Container for the CALayer tree drawn by the browser compositor.
-  scoped_ptr<BrowserCompositorViewMac> browser_compositor_view_;
+  // Container for ui::Compositor the CALayer tree drawn by it.
+  scoped_ptr<BrowserCompositorMac> browser_compositor_;
 
-  // Placeholder that is allocated while browser_compositor_view_ is NULL,
+  // Placeholder that is allocated while browser_compositor_ is NULL,
   // indicating that a BrowserCompositorViewMac may be allocated. This is to
   // help in recycling the internals of BrowserCompositorViewMac.
-  scoped_ptr<BrowserCompositorViewPlaceholderMac>
-      browser_compositor_view_placeholder_;
+  scoped_ptr<BrowserCompositorMacPlaceholder>
+      browser_compositor_placeholder_;
 
   NSWindow* pepper_fullscreen_window() const {
     return pepper_fullscreen_window_;
   }
 
   CONTENT_EXPORT void release_pepper_fullscreen_window_for_testing();
 
   RenderWidgetHostViewMac* fullscreen_parent_host_view() const {
     return fullscreen_parent_host_view_;
   }
@@ skipping 15 matching lines @@
   ui::Compositor* GetCompositor() const override;
   ui::Layer* GetLayer() override;
   RenderWidgetHostImpl* GetHost() override;
   bool IsVisible() override;
   scoped_ptr<ResizeLock> CreateResizeLock(bool defer_compositor_lock) override;
   gfx::Size DesiredFrameSize() override;
   float CurrentDeviceScaleFactor() override;
   gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) override;
   DelegatedFrameHost* GetDelegatedFrameHost() const override;
 
-  // BrowserCompositorViewMacClient implementation.
-  bool BrowserCompositorViewShouldAckImmediately() const override;
-  void BrowserCompositorViewFrameSwapped(
+  // AcceleratedWidgetMacNSView implementation.
+  NSView* AcceleratedWidgetGetNSView() const override;
+  bool AcceleratedWidgetShouldIgnoreBackpressure() const override;
+  void AcceleratedWidgetSwapCompleted(
       const std::vector<ui::LatencyInfo>& latency_info) override;
+  void AcceleratedWidgetHitError() override;
 
   // Transition from being in the Suspended state to being in the Destroyed
   // state, if appropriate (see BrowserCompositorViewState for details).
   void DestroySuspendedBrowserCompositorViewIfNeeded();
 
  private:
   friend class RenderWidgetHostViewMacTest;
 
   // Returns whether this render view is a popup (autocomplete window).
   bool IsPopup() const;
@@ skipping 73 matching lines @@
 
   // The current caret bounds.
   gfx::Rect caret_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_