Tighter sync and faster ACK on SwapBuffers/PostSubBuffers

content/browser/renderer_host/render_widget_host_view_aura.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_AURA_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 #pragma once
 
 #include <map>
 #include <vector>
@@ skipping 166 matching lines @@
 
   // Should construct only via RenderWidgetHostView::CreateViewForWidget.
   explicit RenderWidgetHostViewAura(content::RenderWidgetHost* host);
 
  private:
   class WindowObserver;
   friend class WindowObserver;
 
   // Overridden from ui::CompositorObserver:
   virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE;
+  virtual void OnCompositingWillEnd(ui::Compositor* compositor) OVERRIDE;
   virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE;
 
   // Overridden from ImageTransportFactoryObserver:
   virtual void OnLostResources(ui::Compositor* compositor) OVERRIDE;
 
   void UpdateCursorIfOverSelf();
   void UpdateExternalTexture();
   ui::InputMethod* GetInputMethod() const;
 
   // Returns whether the widget needs an input grab to work properly.
   bool NeedsInputGrab();
 
   // Confirm existing composition text in the webpage and ask the input method
   // to cancel its ongoing composition session.
   void FinishImeCompositionSession();
 
   // This method computes movementX/Y and keeps track of mouse location for
   // mouse lock on all mouse move events.
   void ModifyEventMovementAndCoords(WebKit::WebMouseEvent* event);
 
   // If |clip| is non-empty and and doesn't contain |rect| or |clip| is empty
   // SchedulePaint() is invoked for |rect|.
   void SchedulePaintIfNotInClip(const gfx::Rect& rect, const gfx::Rect& clip);
 
   // Helper method to determine if, in mouse locked mode, the cursor should be
   // moved to center.
   bool ShouldMoveToCenter();
 
-  // Run the compositing callbacks.
-  void RunCompositingCallbacks();
+  // If compositor == NULL, run all the compositing callbacks. Otherwise,
+  // only run the callbacks that were waiting for
+  // compositor->last_will_end_id().
+  void RunCompositingCallbacks(ui::Compositor* compositor);
 
   // Called when window_ is removed from the window tree.
   void RemovingFromRootWindow();
 
   ui::Compositor* GetCompositor();
 
   // The model object.
   content::RenderWidgetHostImpl* host_;
 
   aura::Window* window_;
@@ skipping 32 matching lines @@
   // Rectangles before and after the selection.
   gfx::Rect selection_start_rect_;
   gfx::Rect selection_end_rect_;
 
   // Indicates if there is onging composition text.
   bool has_composition_text_;
 
   // Current tooltip text.
   string16 tooltip_;
 
-  std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_;
+  // Callback and the number of the will end composite that it should run on.
+  typedef std::pair<base::Callback<void(void)>, int>
+      CallbackAndCompositeNumber;
+  std::vector<CallbackAndCompositeNumber> on_compositing_will_end_callbacks_;
 
   std::map<uint64, scoped_refptr<ImageTransportClient> >
       image_transport_clients_;
 
   uint64 current_surface_;
 
   gfx::GLSurfaceHandle shared_surface_handle_;
 
   // If non-NULL we're in OnPaint() and this is the supplied canvas.
   gfx::Canvas* paint_canvas_;
@@ skipping 22 matching lines @@
   // These locks are the ones waiting for a texture of the right size to come
   // back from the renderer/GPU process.
   std::vector<linked_ptr<ResizeLock> > resize_locks_;
   // These locks are the ones waiting for a frame to be drawn.
   std::vector<linked_ptr<ResizeLock> > locks_pending_draw_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_