MacViews: Fix WidgetTest.DesktopNativeWidgetNoPaintAfterCloseTest

ui/views/cocoa/bridged_content_view.mm

 // Copyright 2014 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 "ui/views/cocoa/bridged_content_view.h"
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ui/base/ime/text_input_client.h"
@@ skipping 12 matching lines @@
 // Execute a command on the currently focused TextInputClient.
 // |commandId| should be a resource ID from ui_strings.grd.
 - (void)doCommandByID:(int)commandId;
 
 @end
 
 @implementation BridgedContentView
 
 @synthesize hostedView = hostedView_;
 @synthesize textInputClient = textInputClient_;
+@synthesize willShow = willShow_;
 
 - (id)initWithView:(views::View*)viewToHost {
   DCHECK(viewToHost);
   gfx::Rect bounds = viewToHost->bounds();
   // To keep things simple, assume the origin is (0, 0) until there exists a use
   // case for something other than that.
   DCHECK(bounds.origin().IsOrigin());
   NSRect initialFrame = NSMakeRect(0, 0, bounds.width(), bounds.height());
   if ((self = [super initWithFrame:initialFrame])) {
     hostedView_ = viewToHost;
@@ skipping 39 matching lines @@
 
 - (void)setFrameSize:(NSSize)newSize {
   [super setFrameSize:newSize];
   if (!hostedView_)
     return;
 
   hostedView_->SetSize(gfx::Size(newSize.width, newSize.height));
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
-  if (!hostedView_)
+  // Note that on a Show, Cocoa calls drawRect: before changing
+  // -[NSWindow isVisible], hence the extra check.
+  if (!hostedView_ || (!willShow_ && ![[self window] isVisible]))
     return;
 
   gfx::CanvasSkiaPaint canvas(dirtyRect, false /* opaque */);
-  hostedView_->Paint(&canvas, views::CullSet());
+  hostedView_->GetWidget()->OnNativeWidgetPaint(&canvas);
 }
 
 // NSResponder implementation.
 
 - (void)keyDown:(NSEvent*)theEvent {
   if (textInputClient_)
     [self interpretKeyEvents:@[ theEvent ]];
   else
     [super keyDown:theEvent];
 }
@@ skipping 208 matching lines @@
   }
 
   return [super accessibilityAttributeValue:attribute];
 }
 
 - (id)accessibilityHitTest:(NSPoint)point {
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
 @end