Reverting 11396.

webkit/tools/test_shell/webwidget_host_gtk.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 "webkit/tools/test_shell/webwidget_host.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
@@ skipping 267 matching lines @@
 }
 
 void WebWidgetHost::Resize(const gfx::Size &newsize) {
   // The pixel buffer backing us is now the wrong size
   canvas_.reset();
 
   webwidget_->Resize(gfx::Size(newsize.width(), newsize.height()));
 }
 
 void WebWidgetHost::Paint() {
-  PaintToCanvas();
-  PaintCanvasToView();
-}
-
-void WebWidgetHost::PaintToCanvas() {
   int width = view_->allocation.width;
   int height = view_->allocation.height;
   gfx::Rect client_rect(width, height);
 
   // Allocate a canvas if necessary
   if (!canvas_.get()) {
     ResetScrollRect();
     paint_rect_ = client_rect;
     canvas_.reset(new skia::PlatformCanvas(width, height, true));
     if (!canvas_.get()) {
@@ skipping 18 matching lines @@
       gfx::Rect rect(paint_rect_);
       paint_rect_ = gfx::Rect();
 
       DLOG_IF(WARNING, i == 1) << "painting caused additional invalidations";
       PaintRect(rect);
       total_paint = total_paint.Union(rect);
     }
   }
   DCHECK(paint_rect_.IsEmpty());
 
-}
-
-void WebWidgetHost::PaintCanvasToView() {
   // Invalidate the paint region on the widget's underlying gdk window. Note
   // that gdk_window_invalidate_* will generate extra expose events, which
   // we wish to avoid. So instead we use calls to begin_paint/end_paint.
   GdkRectangle grect = {
-      0,
-      0,
-      canvas_->getDevice()->width(),
-      canvas_->getDevice()->height(),
+      total_paint.x(),
+      total_paint.y(),
+      total_paint.width(),
+      total_paint.height(),
   };
   GdkWindow* window = view_->window;
   gdk_window_begin_paint_rect(window, &grect);
 
   // BitBlit to the gdk window.
   skia::PlatformDeviceLinux &platdev = canvas_->getTopPlatformDevice();
   skia::BitmapPlatformDeviceLinux* const bitdev =
       static_cast<skia::BitmapPlatformDeviceLinux* >(&platdev);
   cairo_t* cairo_drawable = gdk_cairo_create(window);
   cairo_set_source_surface(cairo_drawable, bitdev->surface(), 0, 0);
   cairo_paint(cairo_drawable);
   cairo_destroy(cairo_drawable);
 
   gdk_window_end_paint(window);
 }
 
-void WebWidgetHost::DisplayForRepaint() {
-  PaintToCanvas();
-
-  // Paint a gray mask over everything for the repaint Layout tests.
-  const SkColor kMaskColor = SkColorSetARGB(168, 0, 0, 0);  // alpha=0.66
-  canvas_->drawColor(kMaskColor, SkPorterDuff::kSrcOver_Mode);
-
-  PaintCanvasToView();
-}
-
 void WebWidgetHost::ResetScrollRect() {
   // This method is only needed for optimized scroll painting, which we don't
   // care about in the test shell, yet.
 }
 
 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
   set_painting(true);
   webwidget_->Paint(canvas_.get(), rect);
   set_painting(false);
 }
 
 void WebWidgetHost::WindowDestroyed() {
   delete this;
 }