Revert 86625 - This change implements a first pass in the effort to remove the dependency of Plat...

webkit/tools/test_shell/webwidget_host_win.cc

Index: webkit/tools/test_shell/webwidget_host_win.cc
===================================================================
--- webkit/tools/test_shell/webwidget_host_win.cc	(revision 86628)
+++ webkit/tools/test_shell/webwidget_host_win.cc	(working copy)
@@ -251,13 +251,13 @@
   // Scroll the canvas if necessary
   scroll_rect_ = client_rect.Intersect(scroll_rect_);
   if (!scroll_rect_.IsEmpty()) {
-    skia::ScopedPlatformPaint scoped_platform_paint(canvas_.get());
-    HDC hdc = scoped_platform_paint.GetPlatformSurface();
+    HDC hdc = canvas_->beginPlatformPaint();
 
     RECT damaged_rect, r = scroll_rect_.ToRECT();
     ScrollDC(hdc, scroll_dx_, scroll_dy_, NULL, &r, NULL, &damaged_rect);
 
     PaintRect(gfx::Rect(damaged_rect));
+    canvas_->endPlatformPaint();
   }
   ResetScrollRect();
 
@@ -279,8 +279,10 @@
   // Paint to the screen
   PAINTSTRUCT ps;
   BeginPaint(view_, &ps);
-  skia::DrawToNativeContext(canvas_.get(), ps.hdc, ps.rcPaint.left,
-                            ps.rcPaint.top, &ps.rcPaint);
+  canvas_->getTopPlatformDevice().drawToHDC(ps.hdc,
+                                            ps.rcPaint.left,
+                                            ps.rcPaint.top,
+                                            &ps.rcPaint);
   EndPaint(view_, &ps);
 
   // Draw children