Delay UpdateRect until the SwapBuffers callback when accelerated compositing is on.

content/renderer/render_widget.h

 // Copyright (c) 2011 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_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 #pragma once
 
+#include <queue>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "content/common/content_export.h"
 #include "content/renderer/paint_aggregator.h"
 #include "ipc/ipc_channel.h"
@@ skipping 37 matching lines @@
 namespace webkit {
 namespace npapi {
 struct WebPluginGeometry;
 }  // namespace npapi
 
 namespace ppapi {
 class PluginInstance;
 }  // namespace ppapi
 }  // namespace webkit
 
+struct ViewHostMsg_UpdateRect_Params;

[jam, 2011/11/11 03:03:45]

nit: i thought the convention was to put this before the namespace forward
declarations?

[piman, 2011/11/16 01:00:55]

Done.

+class ViewHostMsg_UpdateRect;
+
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
 class CONTENT_EXPORT RenderWidget
     : public IPC::Channel::Listener,
       public IPC::Message::Sender,
       NON_EXPORTED_BASE(virtual public WebKit::WebWidgetClient),
       public base::RefCounted<RenderWidget> {
  public:
   // Creates a new RenderWidget.  The opener_id is the routing ID of the
   // RenderView that this widget lives inside.
@@ skipping 190 matching lines @@
   // Sets the "hidden" state of this widget.  All accesses to is_hidden_ should
   // use this method so that we can properly inform the RenderThread of our
   // state.
   void SetHidden(bool hidden);
 
   bool is_hidden() const { return is_hidden_; }
 
   void WillToggleFullscreen();
   void DidToggleFullscreen();
 
-  // True if an UpdateRect_ACK message is pending.
-  bool update_reply_pending() const {
-    return update_reply_pending_;
-  }
-
   bool next_paint_is_resize_ack() const;
   bool next_paint_is_restore_ack() const;
   void set_next_paint_is_resize_ack();
   void set_next_paint_is_restore_ack();
   void set_next_paint_is_repaint_ack();
 
   // Checks if the text input state and compose inline mode have been changed.
   // If they are changed, the new value will be sent to the browser process.
   void UpdateTextInputState();
 
@@ skipping 175 matching lines @@
   bool is_accelerated_compositing_active_;
 
   base::Time animation_floor_time_;
   bool animation_update_pending_;
   bool animation_task_posted_;
   bool invalidation_task_posted_;
 
   bool has_disable_gpu_vsync_switch_;
   base::TimeTicks last_do_deferred_update_time_;
 
+  // UpdateRect parameters for the current compositing pass. This is used to
+  // pass state between DoDeferredUpdate and OnSwapBuffersPosted.
+  scoped_ptr<ViewHostMsg_UpdateRect_Params> pending_update_params_;
+
+  // Queue of UpdateRect messages corresponding to a SwapBuffers. We want to
+  // delay sending of UpdateRect until the corresponding SwapBuffers has been
+  // executed. Since we can have several in flight, we need to keep them in a
+  // queue. Note: some SwapBuffers may not correspond to an update, in which
+  // case NULL is added to the queue.
+  std::queue<ViewHostMsg_UpdateRect*> updates_pending_swap_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_