Fix for

http://build.chromium.org/buildbot/waterfall/builders/Modules%20Mac%20(valgrind)/builds/1303/steps/valgrind%20test:%20unit/logs/stdio

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

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

2 files changed, 21 insertions, 1 deletions

diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 7e1d9aa..6e7b629 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -647,8 +647,16 @@ willPositionSheet:(NSWindow *)sheet
     [content removeFromSuperview];
     [window_ setContentView:content];
     [self setWindow:window_.get()];
-    [window_ makeKeyAndOrderFront:self];
     [content setNeedsDisplay:YES];
+
+    // With this call, valgrind yells at me about "Conditional jump or
+    // move depends on uninitialised value(s)".  The error happens in
+    // -[NSThemeFrame drawOverlayRect:].  I'm pretty convinced this is
+    // an Apple bug, but there is no visual impact.  I have been
+    // unable to tickle it away with other window or view manipulation
+    // Cocoa calls.  Stack added to suppressions_mac.txt.
+    [window_ makeKeyAndOrderFront:self];
+
     [fullscreen_window_ close];
     fullscreen_window_.reset(nil);
   }
diff --git a/tools/valgrind/suppressions_mac.txt b/tools/valgrind/suppressions_mac.txt
index 0255a3b..7801dda 100644
--- a/tools/valgrind/suppressions_mac.txt
+++ b/tools/valgrind/suppressions_mac.txt
@@ -245,3 +245,15 @@
    fun:MyActivateTSMDocument
    fun:ActivateTSMDocument
 }
+{
+   # Looks like an Apple bug; has no visual impact.
+   unitialized_rect_allocated_on_stack_when_reparenting_window_content_views
+   Memcheck:Cond
+   fun:NSRectClip
+   fun:-[NSThemeFrame drawOverlayRect:]
+   ...
+   fun:-[NSWindow makeKeyAndOrderFront:]
+   fun:-[BrowserWindowController setFullscreen:]
+   ...
+   fun:main
+}