Add support for the "repaint" layout tests (LayoutTests/fast/repaint/*), which draw a gray mask over regions that have not been updated.

This still doesn't match the mac expected results, because clip area is wrong.

BUG=8630

Review URL: http://codereview.chromium.org/21192

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11396 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 4 deletions

diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index fc4be75..a8b561c 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -210,6 +210,11 @@ void WebWidgetHost::UpdatePaintRect(const gfx::Rect& rect) {
 }
 
 void WebWidgetHost::Paint() {
+  PaintToCanvas();
+  PaintCanvasToView();
+}
+
+void WebWidgetHost::PaintToCanvas() {
   RECT r;
   GetClientRect(view_, &r);
   gfx::Rect client_rect(r);
@@ -251,8 +256,9 @@ void WebWidgetHost::Paint() {
     }
   }
   DCHECK(paint_rect_.IsEmpty());
+}
 
-  // Paint to the screen
+void WebWidgetHost::PaintCanvasToView() {
   PAINTSTRUCT ps;
   BeginPaint(view_, &ps);
   canvas_->getTopPlatformDevice().drawToHDC(ps.hdc,
@@ -265,6 +271,16 @@ void WebWidgetHost::Paint() {
   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();
@@ -283,9 +299,9 @@ void WebWidgetHost::MouseEvent(UINT message, WPARAM wparam, LPARAM lparam) {
       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;