Reverting 11396.

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 11408)
+++ webkit/tools/test_shell/webwidget_host_win.cc	(working copy)
@@ -210,11 +210,6 @@
 }
 
 void WebWidgetHost::Paint() {
-  PaintToCanvas();
-  PaintCanvasToView();
-}
-
-void WebWidgetHost::PaintToCanvas() {
   RECT r;
   GetClientRect(view_, &r);
   gfx::Rect client_rect(r);
@@ -256,9 +251,8 @@
     }
   }
   DCHECK(paint_rect_.IsEmpty());
-}
 
-void WebWidgetHost::PaintCanvasToView() {
+  // Paint to the screen
   PAINTSTRUCT ps;
   BeginPaint(view_, &ps);
   canvas_->getTopPlatformDevice().drawToHDC(ps.hdc,
@@ -271,16 +265,6 @@
   UpdateWindow(view_);
 }
 
-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::Resize(LPARAM lparam) {
   // Force an entire re-paint.  TODO(darin): Maybe reuse this memory buffer.
   DiscardBackingStore();
@@ -299,9 +283,9 @@
       break;
     case WebInputEvent::MOUSE_DOWN:
       SetCapture(view_);
-      // This mimics a temporary workaround in RenderWidgetHostViewWin
-      // for bug 765011 to get focus when the mouse is clicked. This
-      // happens after the mouse down event is sent to the renderer
+      // This mimics a temporary workaround in RenderWidgetHostViewWin 
+      // for bug 765011 to get focus when the mouse is clicked. This 
+      // happens after the mouse down event is sent to the renderer 
       // because normally Windows does a WM_SETFOCUS after WM_LBUTTONDOWN.
       ::SetFocus(view_);
       break;