Refactors RenderWidget to extract a PaintAggregator class....

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"
 #include "base/basictypes.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
+#include "chrome/renderer/paint_aggregator.h"
 #include "chrome/renderer/render_process.h"
 #include "ipc/ipc_channel.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCompositionCommand.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebWidgetClient.h"
 #include "webkit/glue/webcursor.h"
 
@@ skipping 86 matching lines @@
   void Init(int32 opener_id);
 
   // Finishes creation of a pending view started with Init.
   void CompleteInit(gfx::NativeViewId parent);
 
   // Paints the given rectangular region of the WebWidget into canvas (a
   // shared memory segment returned by AllocPaintBuf on Windows). The caller
   // must ensure that the given rect fits within the bounds of the WebWidget.
   void PaintRect(const gfx::Rect& rect, skia::PlatformCanvas* canvas);
 
-  void CallDoDeferredPaint();
-  void DoDeferredPaint();
-  void CallDoDeferredScroll();
-  void DoDeferredScroll();
+  void CallDoDeferredUpdate();
+  void DoDeferredUpdate();
   void DoDeferredClose();
   void DoDeferredSetWindowRect(const WebKit::WebRect& pos);
 
   // Set the background of the render widget to a bitmap. The bitmap will be
   // tiled in both directions if it isn't big enough to fill the area. This is
   // mainly intended to be used in conjuction with WebView::SetIsTransparent().
   virtual void SetBackground(const SkBitmap& bitmap);
 
   // RenderWidget IPC message handlers
   void OnClose();
@@ skipping 96 matching lines @@
   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.
   TransportDIB* current_paint_buf_;
   TransportDIB* current_scroll_buf_;
 
-  // The smallest bounding rectangle that needs to be re-painted.  This is non-
-  // empty if a paint event is pending.
-  gfx::Rect paint_rect_;
-
-  // The clip rect for the pending scroll event.  This is non-empty if a
-  // scroll event is pending.
-  gfx::Rect scroll_rect_;
+  PaintAggregator paint_aggregator_;
 
   // The area that must be reserved for drawing the resize corner.
   gfx::Rect resizer_rect_;
 
-  // The scroll delta for a pending scroll event.
-  gfx::Point scroll_delta_;
-
   // Flags for the next ViewHostMsg_PaintRect 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_;
 
   // Set to true if we should ignore RenderWidget::Show calls.
   bool did_show_;
 
@@ skipping 52 matching lines @@
   WebKit::WebRect pending_window_rect_;
 
   scoped_ptr<ViewHostMsg_ShowPopup_Params> popup_params_;
 
   scoped_ptr<IPC::Message> pending_input_event_ack_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 #endif  // CHROME_RENDERER_RENDER_WIDGET_H_