Reverting 11396.

webkit/tools/test_shell/webwidget_host_win.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 "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 192 matching lines @@
   }
 
   return false;
 }
 
 void WebWidgetHost::UpdatePaintRect(const gfx::Rect& rect) {
   paint_rect_ = paint_rect_.Union(rect);
 }
 
 void WebWidgetHost::Paint() {
-  PaintToCanvas();
-  PaintCanvasToView();
-}
-
-void WebWidgetHost::PaintToCanvas() {
   RECT r;
   GetClientRect(view_, &r);
   gfx::Rect client_rect(r);
 
   // Allocate a canvas if necessary
   if (!canvas_.get()) {
     ResetScrollRect();
     paint_rect_ = client_rect;
     canvas_.reset(new skia::PlatformCanvas(
         paint_rect_.width(), paint_rect_.height(), true));
@@ skipping 21 matching lines @@
     paint_rect_ = client_rect.Intersect(paint_rect_);
     if (!paint_rect_.IsEmpty()) {
       gfx::Rect rect(paint_rect_);
       paint_rect_ = gfx::Rect();
 
       DLOG_IF(WARNING, i == 1) << "painting caused additional invalidations";
       PaintRect(rect);
     }
   }
   DCHECK(paint_rect_.IsEmpty());
-}
 
-void WebWidgetHost::PaintCanvasToView() {
+  // Paint to the screen
   PAINTSTRUCT ps;
   BeginPaint(view_, &ps);
   canvas_->getTopPlatformDevice().drawToHDC(ps.hdc,
                                             ps.rcPaint.left,
                                             ps.rcPaint.top,
                                             &ps.rcPaint);
   EndPaint(view_, &ps);
 
   // Draw children
   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();
 
   webwidget_->Resize(gfx::Size(LOWORD(lparam), HIWORD(lparam)));
 }
 
 void WebWidgetHost::MouseEvent(UINT message, WPARAM wparam, LPARAM lparam) {
   WebMouseEvent event(view_, message, wparam, lparam);
   switch (event.type) {
     case WebInputEvent::MOUSE_MOVE:
       TrackMouseLeave(true);
       break;
     case WebInputEvent::MOUSE_LEAVE:
       TrackMouseLeave(false);
       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;
     case WebInputEvent::MOUSE_UP:
       if (GetCapture() == view_)
         ReleaseCapture();
       break;
   }
   webwidget_->HandleInputEvent(&event);
 }
@@ skipping 42 matching lines @@
 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
 #ifndef NDEBUG
   DCHECK(!painting_);
 #endif
   DCHECK(canvas_.get());
 
   set_painting(true);
   webwidget_->Paint(canvas_.get(), rect);
   set_painting(false);
 }