Reverting 11396.

webkit/tools/test_shell/mac/webwidget_host.mm

 // Copyright (c) 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 #include "base/gfx/platform_canvas_mac.h"
 #include "base/gfx/rect.h"
@@ skipping 125 matching lines @@
   TrackMouseLeave(false);
 
   webwidget_->Close();
 }
 
 void WebWidgetHost::UpdatePaintRect(const gfx::Rect& rect) {
   paint_rect_ = paint_rect_.Union(rect);
 }
 
 void WebWidgetHost::Paint() {
-  PaintToCanvas();
-  PaintCanvasToView();
-}
-
-void WebWidgetHost::PaintToCanvas() {
   NSRect r = [view_ frame];
   gfx::Rect client_rect(NSRectToCGRect(r));
   NSGraphicsContext* view_context = [NSGraphicsContext currentContext];
+  CGContextRef context = static_cast<CGContextRef>([view_context graphicsPort]);
 
   // 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));
   }
 
   // make sure webkit draws into our bitmap, not the window
@@ skipping 24 matching lines @@
       paint_rect_ = gfx::Rect();
 
 //      DLOG_IF(WARNING, i == 1) << "painting caused additional invalidations";
       PaintRect(rect);
     }
   }
   DCHECK(paint_rect_.IsEmpty());
 
   // set the context back to our window
   [NSGraphicsContext setCurrentContext: view_context];
-}
 
-void WebWidgetHost::PaintCanvasToView() {
   // Paint to the screen
   if ([view_ lockFocusIfCanDraw]) {
-    NSGraphicsContext* view_context = [NSGraphicsContext currentContext];
-    NSRect r = [view_ frame];
-    CGContextRef bitmap_context =
-        canvas_->getTopPlatformDevice().GetBitmapContext();
-    CGContextRef context =
-        static_cast<CGContextRef>([view_context graphicsPort]);
     CGRect paint_rect = NSRectToCGRect(r);
     int bitmap_height = CGBitmapContextGetHeight(bitmap_context);
     int bitmap_width = CGBitmapContextGetWidth(bitmap_context);
     CGRect bitmap_rect = { { 0, 0 },
                            { bitmap_width, bitmap_height } };
     canvas_->getTopPlatformDevice().DrawToContext(
-        context, 0, r.size.height - bitmap_height, &bitmap_rect);
+        context, 0, client_rect.height() - bitmap_height, &bitmap_rect);
 
     [view_ unlockFocus];
   }
 }
 
-void WebWidgetHost::DisplayForRepaint() {
-  PaintToCanvas();
-
-  // Paint a gray mask over everything for the repaint Layout tests.
-  CGContextRef bitmap_context =
-      canvas_->getTopPlatformDevice().GetBitmapContext();
-  CGRect bitmap_rect = { { 0, 0 },
-      { CGBitmapContextGetWidth(bitmap_context),
-        CGBitmapContextGetHeight(bitmap_context) } };
-  CGContextSetBlendMode(bitmap_context, kCGBlendModeNormal);
-  CGContextSetRGBFillColor(bitmap_context, 0, 0, 0, 0.66);
-  CGContextFillRect(bitmap_context, bitmap_rect);
-
-  PaintCanvasToView();
-}
-
 void WebWidgetHost::Resize(const gfx::Rect& rect) {
   // Force an entire re-paint.  TODO(darin): Maybe reuse this memory buffer.
   DiscardBackingStore();
   webwidget_->Resize(gfx::Size(rect.width(), rect.height()));
 }
 
 void WebWidgetHost::MouseEvent(NSEvent *event) {
   WebMouseEvent web_event(event, view_);
   switch (web_event.type) {
     case WebInputEvent::MOUSE_MOVE:
@@ skipping 34 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);
 }