Combine ViewHostMsg_{Paint,Scroll}Rect into one IPC....

chrome/renderer/render_widget.h

 // Copyright (c) 2009 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 CHROME_RENDERER_RENDER_WIDGET_H_
 #define CHROME_RENDERER_RENDER_WIDGET_H_
 
 #include <vector>
 
 #include "app/gfx/native_widget_types.h"
@@ skipping 124 matching lines @@
   // mainly intended to be used in conjuction with WebView::SetIsTransparent().
   virtual void SetBackground(const SkBitmap& bitmap);
 
   // RenderWidget IPC message handlers
   void OnClose();
   void OnCreatingNewAck(gfx::NativeViewId parent);
   virtual void OnResize(const gfx::Size& new_size,
                         const gfx::Rect& resizer_rect);
   void OnWasHidden();
   void OnWasRestored(bool needs_repainting);
-  void OnPaintRectAck();
-  void OnScrollRectAck();
+  void OnUpdateRectAck();
   void OnRequestMoveAck();
   void OnHandleInputEvent(const IPC::Message& message);
   void OnMouseCaptureLost();
   void OnSetFocus(bool enable);
   void OnImeSetInputMode(bool is_active);
   void OnImeSetComposition(WebKit::WebCompositionCommand command,
                            int cursor_position,
                            int target_start, int target_end,
                            const string16& ime_string);
   void OnMsgRepaint(const gfx::Size& size_to_paint);
   void OnSetTextDirection(WebKit::WebTextDirection direction);
 
   // Override point to notify that a paint has happened. This fires after the
   // browser side has updated the screen for a newly painted region.
   virtual void DidPaint() {}
 
   // 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_; }
 
-  // True if a PaintRect_ACK message is pending.
-  bool paint_reply_pending() const {
-    return paint_reply_pending_;
-  }
-
-  // True if a ScrollRect_ACK message is pending.
-  bool scroll_reply_pending() const {
-    return current_scroll_buf_ != NULL;
+  // 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();
 
   // Called when a renderer process moves an input focus or updates the
   // position of its caret.
@@ skipping 43 matching lines @@
   // The window we are embedded within.  TODO(darin): kill this.
   gfx::NativeViewId host_window_;
 
   // We store the current cursor object so we can avoid spamming SetCursor
   // messages.
   WebCursor current_cursor_;
 
   // The size of the RenderWidget.
   gfx::Size size_;
 
-  // Transport DIBs that are currently in use to transfer an image to the
-  // browser.
+  // The TransportDIB that is being used to transfer an image to the browser.
   TransportDIB* current_paint_buf_;
-  TransportDIB* current_scroll_buf_;
 
   PaintAggregator paint_aggregator_;
 
   // The area that must be reserved for drawing the resize corner.
   gfx::Rect resizer_rect_;
 
-  // Flags for the next ViewHostMsg_PaintRect message.
+  // Flags for the next ViewHostMsg_UpdateRect message.
   int next_paint_flags_;
 
-  // True if we are expecting a PaintRect_ACK message (i.e., that a PaintRect
-  // message has been sent).
-  bool paint_reply_pending_;
+  // True if we are expecting an UpdateRect_ACK message (i.e., that a
+  // UpdateRect message has been sent).
+  bool update_reply_pending_;
 
   // Set to true if we should ignore RenderWidget::Show calls.
   bool did_show_;
 
   // Indicates that we shouldn't bother generated paint events.
   bool is_hidden_;
 
   // Indicates that we should be repainted when restored.  This flag is set to
   // true if we receive an invalidation / scroll event from webkit while our
   // is_hidden_ flag is set to true.  This is used to force a repaint once we
@@ skipping 49 matching lines @@
 
   scoped_ptr<IPC::Message> pending_input_event_ack_;
 
   // Indicates if the next sequence of Char events should be suppressed or not.
   bool suppress_next_char_events_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 #endif  // CHROME_RENDERER_RENDER_WIDGET_H_