Reverting 20516.

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 339 matching lines @@
   GdkRectangle grect = {
       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::PlatformDevice& platdev = canvas_->getTopPlatformDevice();
-  skia::BitmapPlatformDevice* const bitdev =
-      static_cast<skia::BitmapPlatformDevice*>(&platdev);
+  cairo_t* source_surface = canvas_->beginPlatformPaint();
   cairo_t* cairo_drawable = gdk_cairo_create(window);
-  cairo_set_source_surface(cairo_drawable, bitdev->surface(), 0, 0);
+  cairo_set_source_surface(cairo_drawable, cairo_get_target(source_surface),
+                           0, 0);
   cairo_paint(cairo_drawable);
   cairo_destroy(cairo_drawable);
 
   gdk_window_end_paint(window);
 }
 
 WebScreenInfo WebWidgetHost::GetScreenInfo() {
   Display* display = test_shell_x11::GtkWidgetGetDisplay(view_);
   int screen_num = test_shell_x11::GtkWidgetGetScreenNum(view_);
   return WebScreenInfoFactory::screenInfo(display, screen_num);
 }
 
 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;
 }