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

chrome/browser/renderer_host/backing_store_x.cc

 // 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/backing_store.h"
 
 #include <stdlib.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #if defined(TOOLKIT_GTK)
@@ skipping 293 matching lines @@
 
   // In the case of shared memory, we wait for the composite to complete so that
   // we are sure that the X server has finished reading.
   if (use_shared_memory_)
     XSync(display_, False);
 
   XRenderFreePicture(display_, picture);
   XFreePixmap(display_, pixmap);
 }
 
-void BackingStore::ScrollRect(int dx, int dy,
+void BackingStore::ScrollRect(base::ProcessHandle process,
+                              TransportDIB* bitmap,
+                              const gfx::Rect& bitmap_rect,
+                              int dx, int dy,
                               const gfx::Rect& clip_rect,
                               const gfx::Size& view_size) {
   if (!display_)
     return;
 
   // We only support scrolling in one direction at a time.
   DCHECK(dx == 0 || dy == 0);
 
   if (dy) {
     // Positive values of |dy| scroll up
@@ skipping 11 matching lines @@
     if (abs(dx) < clip_rect.width()) {
       XCopyArea(display_, pixmap_, pixmap_, static_cast<GC>(pixmap_gc_),
                 std::max(clip_rect.x(), clip_rect.x() - dx),
                 clip_rect.y() /* source y */,
                 clip_rect.width() - abs(dx),
                 clip_rect.height(),
                 std::max(clip_rect.x(), clip_rect.x() + dx) /* dest x */,
                 clip_rect.y() /* dest x */);
     }
   }
+
+  PaintRect(process, bitmap, bitmap_rect, bitmap_rect);
 }
 
 void BackingStore::ShowRect(const gfx::Rect& rect, XID target) {
   XCopyArea(display_, pixmap_, target, static_cast<GC>(pixmap_gc_),
             rect.x(), rect.y(), rect.width(), rect.height(),
             rect.x(), rect.y());
 }
 
 #if defined(TOOLKIT_GTK)
 void BackingStore::PaintToRect(const gfx::Rect& rect, GdkDrawable* target) {
@@ skipping 85 matching lines @@
 
   if (use_shared_memory_)
     DestroySharedImage(display_, image, &shminfo);
   else
     XDestroyImage(image);
 
   HISTOGRAM_TIMES("BackingStore.RetrievalFromX",
                   base::TimeTicks::Now() - begin_time);
   return bitmap;
 }