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

chrome/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include "base/histogram.h"
 #import "base/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 257 matching lines @@
   // origin is the upper-left corner of this view. On the other hand, Cocoa
   // uses a coordinate system whose origin is the lower-left corner of this
   // view. So, we convert the cursor rectangle and save it.
   NSRect view_rect = [cocoa_view_ bounds];
   const int y_offset = static_cast<int>(view_rect.size.height);
   im_caret_rect_ = NSMakeRect(caret_rect.x(),
                               y_offset - caret_rect.y() - caret_rect.height(),
                               caret_rect.width(), caret_rect.height());
 }
 
-void RenderWidgetHostViewMac::DidPaintBackingStoreRects(
-    const std::vector<gfx::Rect>& rects) {
+void RenderWidgetHostViewMac::DidPaintRect(const gfx::Rect& rect) {
   if (is_hidden_)
     return;
 
-  for (size_t i = 0; i < rects.size(); ++i) {
-    NSRect ns_rect = [cocoa_view_ RectToNSRect:rects[i]];
+  NSRect ns_rect = [cocoa_view_ RectToNSRect:rect];
 
-    if (about_to_validate_and_paint_) {
-      // As much as we'd like to use -setNeedsDisplayInRect: here, we can't.
-      // We're in the middle of executing a -drawRect:, and as soon as it
-      // returns Cocoa will clear its record of what needs display. If we want
-      // to handle the recursive drawing, we need to do it ourselves.
-      invalid_rect_ = NSUnionRect(invalid_rect_, ns_rect);
-    } else {
-      [cocoa_view_ setNeedsDisplayInRect:ns_rect];
-    }
+  if (about_to_validate_and_paint_) {
+    // As much as we'd like to use -setNeedsDisplayInRect: here, we can't. We're
+    // in the middle of executing a -drawRect:, and as soon as it returns Cocoa
+    // will clear its record of what needs display. If we want to handle the
+    // recursive drawing, we need to do it ourselves.
+    invalid_rect_ = NSUnionRect(invalid_rect_, ns_rect);
+  } else {
+    [cocoa_view_ setNeedsDisplayInRect:ns_rect];
+    [cocoa_view_ displayIfNeeded];
   }
-
-  if (!about_to_validate_and_paint_)
-    [cocoa_view_ displayIfNeeded];
 }
 
-void RenderWidgetHostViewMac::DidScrollBackingStoreRect(const gfx::Rect& rect,
-                                                        int dx, int dy) {
+void RenderWidgetHostViewMac::DidScrollRect(
+    const gfx::Rect& rect, int dx, int dy) {
   if (is_hidden_)
     return;
 
   // We've already modified the BackingStore to reflect the scroll, so
   // simply ask the RWHVCocoa to redraw itself based on the new
   // pixels.  We cannot use -[NSView scrollRect:by:] here because the
   // findbar and blocked popups will leave trails behind.
   // TODO(rohitrao): Evaluate how slow this full redraw is.  If it
   // turns out to be a problem, consider scrolling only a portion of
   // the view, based on where the findbar and blocked popups are.
-  DidPaintBackingStoreRects(std::vector<gfx::Rect>(1, rect));
+  DidPaintRect(rect);
 }
 
 void RenderWidgetHostViewMac::RenderViewGone() {
   // TODO(darin): keep this around, and draw sad-tab into it.
   UpdateCursorIfOverSelf();
   Destroy();
 }
 
 void RenderWidgetHostViewMac::Destroy() {
   // On Windows, popups are implemented with a popup window style, so that when
@@ skipping 1062 matching lines @@
     event.skip_in_browser = true;
     renderWidgetHostView_->render_widget_host_->ForwardKeyboardEvent(event);
   } else {
     renderWidgetHostView_->render_widget_host_->ImeConfirmComposition(
         UTF8ToUTF16([im_text UTF8String]));
   }
   renderWidgetHostView_->im_composing_ = false;
 }
 
 @end