Unobfuscate RWHVMac accelerated compositing code path by separating it from plugin code

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_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
+#include <list>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "content/browser/accessibility/browser_accessibility_delegate_mac.h"
 #include "content/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/edit_command.h"
 #import "content/public/browser/render_widget_host_view_mac_base.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "ui/base/cocoa/base_view.h"
 #include "webkit/glue/webcursor.h"
 
 @class AcceleratedPluginView;
+class CompositingIOSurfaceMac;
 @class FullscreenWindowManager;
 class RenderWidgetHostViewMac;
 @protocol RenderWidgetHostViewMacDelegate;
 class RenderWidgetHostViewMacEditCommandHelper;
 @class ToolTip;
 
 namespace content {
 class RenderWidgetHostImpl;
 }
 
@@ skipping 84 matching lines @@
   int focusedPluginIdentifier_;
 
   // Whether or not plugin IME is currently enabled active.
   BOOL pluginImeActive_;
 
   // Whether the previous mouse event was ignored due to hitTest check.
   BOOL mouseEventWasIgnored_;
 
   // Event monitor for gesture-end events.
   id endGestureMonitor_;
+
+  // OpenGL Support:
+
+  // recursive globalFrameDidChange protection:
+  BOOL handlingGlobalFrameDidChange_;
+
+  // Set to YES once a GL context is attached to this NSView; never set back to
+  // NO.
+  BOOL hasGLContext_;
 }
 
 @property(nonatomic, readonly) NSRange selectedRange;
 
 - (void)setCanBeKeyView:(BOOL)can;
 - (void)setTakesFocusOnlyOnMouseDown:(BOOL)b;
 - (void)setCloseOnDeactivate:(BOOL)b;
 - (void)setToolTipAtMousePoint:(NSString *)string;
 // True for always-on-top special windows (e.g. Balloons and Panels).
 - (BOOL)acceptsMouseEventsWhenInactive;
 // Cancel ongoing composition (abandon the marked text).
 - (void)cancelComposition;
 // Confirm ongoing composition.
 - (void)confirmComposition;
 // Enables or disables plugin IME.
 - (void)setPluginImeActive:(BOOL)active;
 // Updates the current plugin focus state.
 - (void)pluginFocusChanged:(BOOL)focused forPlugin:(int)pluginId;
 // Evaluates the event in the context of plugin IME, if plugin IME is enabled.
 // Returns YES if the event was handled.
 - (BOOL)postProcessEventForPluginIme:(NSEvent*)event;
+// Tell the view that a GL context was created and accelerated rendering may
+// ensue.
+- (void)addedGLContext;
 
 @end
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewMac
 //
 //  An object representing the "View" of a rendered web page. This object is
 //  responsible for displaying the content of the web page, and integrating with
 //  the Cocoa view system. It is the implementation of the RenderWidgetHostView
 //  that the cross-platform RenderWidgetHost object uses
@@ skipping 141 matching lines @@
 
   void KillSelf();
 
   void SetTextInputActive(bool active);
 
   // Sends completed plugin IME notification and text back to the renderer.
   void PluginImeCompositionCompleted(const string16& text, int plugin_id);
 
   const std::string& selected_text() const { return selected_text_; }
 
-  void UpdateRootGpuViewVisibility(bool show_gpu_widget);
-
-  // When rendering transitions from gpu to software, the gpu widget can't be
-  // hidden until the software backing store has been updated. This method
-  // checks if the GPU view needs to be hidden and hides it if necessary. It
-  // should be called after the software backing store has been painted to.
-  void HandleDelayedGpuViewHiding();
+  // Call setNeedsDisplay on the cocoa_view_. The IOSurface will be drawn during
+  // the next drawRect. The route_id and gpu_host_id are added to a list to be
+  // acked when the SwapBuffers occurs in drawRect.
+  void CompositorSwapBuffers(uint64 surface_handle,
+                             int32 route_id,
+                             int32 gpu_host_id);
+  // Ack pending SwapBuffers requests (queued up by CompositorSwapBuffers), if
+  // any, to unblock the GPU process. Has no effect if there are no pending
+  // requests.
+  void AckPendingCompositorSwapBuffers();
 
   // These member variables should be private, but the associated ObjC class
   // needs access to them and can't be made a friend.
 
   // The associated Model.  Can be NULL if Destroy() is called when
   // someone (other than superview) has retained |cocoa_view_|.
   content::RenderWidgetHostImpl* render_widget_host_;
 
   // This is true when we are currently painting and thus should handle extra
   // paint requests by expanding the invalid rect rather than actually painting.
@@ skipping 24 matching lines @@
   ui::TextInputType text_input_type_;
   bool can_compose_inline_;
 
   typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*>
       PluginViewMap;
   PluginViewMap plugin_views_;  // Weak values.
 
   // Helper class for managing instances of accelerated plug-ins.
   AcceleratedSurfaceContainerManagerMac plugin_container_manager_;
 
+  scoped_ptr<CompositingIOSurfaceMac> compositing_iosurface_;
+
   NSWindow* pepper_fullscreen_window() const {
     return pepper_fullscreen_window_;
   }
 
  private:
   friend class content::RenderWidgetHostView;
 
   // 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.
   explicit RenderWidgetHostViewMac(content::RenderWidgetHost* widget);
 
-  // If the window is at the root of the plugin container hierachy,
-  // we need to update the geometry manually.
-  void UpdatePluginGeometry(gfx::PluginWindowHandle window,
-                            int32 width,
-                            int32 height);
-
   // Returns whether this render view is a popup (autocomplete window).
   bool IsPopup() const;
 
   // Updates the display cursor if the current event is over the view's window.
   void UpdateCursorIfNecessary();
 
   // Shuts down the render_widget_host_.  This is a separate function so we can
   // invoke it from the message loop.
   void ShutdownHost();
 
@@ skipping 12 matching lines @@
 
   // The text to be shown in the tooltip, supplied by the renderer.
   string16 tooltip_text_;
 
   // Factory used to safely scope delayed calls to ShutdownHost().
   base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
 
   // selected text on the renderer.
   std::string selected_text_;
 
-  bool accelerated_compositing_active_;
+  gfx::PluginWindowHandle compositing_surface_;
 
-  // When rendering transitions from gpu to software, the gpu widget can't be
-  // hidden until the software backing store has been updated. This variable is
-  // set when the gpu widget needs to be hidden once a paint is completed.
-  bool needs_gpu_visibility_update_after_repaint_;
-
-  gfx::PluginWindowHandle compositing_surface_;
+  // List of pending swaps for deferred acking:
+  //   pairs of (route_id, gpu_host_id).
+  std::list<std::pair<int32, int32> > pending_swap_buffers_acks_;
 
   // The fullscreen window used for pepper flash.
   scoped_nsobject<NSWindow> pepper_fullscreen_window_;
   scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_