Relaxes window size DCHECKs in StatusBubbleMac.

chrome/browser/ui/cocoa/status_bubble_mac.mm

Index: chrome/browser/ui/cocoa/status_bubble_mac.mm
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm
index 272cb9d965ff308b42205ce11a12ffa2e5e77d04..44ad7e2144df7efebc6db3eba2ca48640283eed7 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
+#include "base/debug/stack_trace.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_block.h"
 #include "base/mac/sdk_forward_declarations.h"
@@ -205,10 +206,19 @@ void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
 
   CGFloat bubble_width = NSWidth([window_ frame]);
   if (state_ == kBubbleHidden) {
-    DCHECK_EQ(ui::kWindowSizeDeterminedLater.size.width,
-              [window_ frame].size.width);
-    DCHECK_EQ(ui::kWindowSizeDeterminedLater.size.height,
-              [window_ frame].size.height);
+    // TODO(rohitrao): The window size is expected to be (1,1) whenever the
+    // window is hidden, but the GPU bots are hitting cases where this is not
+    // true.  Instead of enforcing this invariant with a DCHECK, add temporary
+    // logging to try and debug it and fix up the window size if needed.
+    // This logging is temporary and should be removed: crbug.com/467998
+    NSRect frame = [window_ frame];
+    if (!CGSizeEqualToSize(frame.size, ui::kWindowSizeDeterminedLater.size)) {
+      LOG(ERROR) << "Window size should be (1,1), but is instead ("
+                 << frame.size.width << "," << frame.size.height << ")";
+      LOG(ERROR) << base::debug::StackTrace().ToString();
+      frame.size = ui::kWindowSizeDeterminedLater.size;

[Ken Russell (switch to Gerrit), 2015/03/17 22:36:23]

Note: I'm not sure how well base::debug::StackTrace works in non-debug builds. I
might have suggested surrounding this logging code with:

#if DCHECK_IS_ON()

(The bots build Release, with dcheck_always_on=1.)

+      [window_ setFrame:frame display:NO];
+    }
     bubble_width = NSWidth(CalculateWindowFrame(/*expand=*/false));
   }
 
@@ -759,10 +769,19 @@ void StatusBubbleMac::UpdateSizeAndPosition() {
   if (state_ == kBubbleHidden) {
     // Verify that hidden bubbles always have size equal to
     // ui::kWindowSizeDeterminedLater.
-    DCHECK_EQ(ui::kWindowSizeDeterminedLater.size.width,
-              [window_ frame].size.width);
-    DCHECK_EQ(ui::kWindowSizeDeterminedLater.size.height,
-              [window_ frame].size.height);
+
+    // TODO(rohitrao): The GPU bots are hitting cases where this is not true.
+    // Instead of enforcing this invariant with a DCHECK, add temporary logging
+    // to try and debug it and fix up the window size if needed.
+    // This logging is temporary and should be removed: crbug.com/467998
+    NSRect frame = [window_ frame];
+    if (!CGSizeEqualToSize(frame.size, ui::kWindowSizeDeterminedLater.size)) {
+      LOG(ERROR) << "Window size should be (1,1), but is instead ("
+                 << frame.size.width << "," << frame.size.height << ")";
+      LOG(ERROR) << base::debug::StackTrace().ToString();
+      frame.size = ui::kWindowSizeDeterminedLater.size;
+      [window_ setFrame:frame display:YES];
+    }
     return;
   }