Fixing the uninitialized value reported in http://crbug.com/63428.

BUG=63428
TEST=mac_valgrind should not fail


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

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

1 files changed, 21 insertions, 18 deletions

diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 7c3eecb..2d3f258 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -1352,24 +1352,27 @@
   NSWindow* window = [self window];
   if ([window respondsToSelector:@selector(_growBoxRect)]) {
     NSView* view = [source view];
-    NSRect windowGrowBoxRect = [window _growBoxRect];
-    NSRect viewRect = [[view superview] convertRect:frameRect toView:nil];
-    NSRect growBoxRect = NSIntersectionRect(windowGrowBoxRect, viewRect);
-    if (!NSIsEmptyRect(growBoxRect)) {
-      // Before we return a rect, we need to convert it from window coordinates
-      // to content area coordinates and flip the coordinate system.
-      // Superview is used here because, first, it's a frame rect, so it is
-      // specified in the parent's coordinates and, second, view is not
-      // positioned yet.
-      growBoxRect = [[view superview] convertRect:growBoxRect fromView:nil];
-      growBoxRect.origin.y =
-          NSHeight(frameRect) - NSHeight(growBoxRect);
-      growBoxRect =
-          NSOffsetRect(growBoxRect, -frameRect.origin.x, -frameRect.origin.y);
-
-      reserved_rect =
-          gfx::Rect(growBoxRect.origin.x, growBoxRect.origin.y,
-                    growBoxRect.size.width, growBoxRect.size.height);
+    if (view && [view superview]) {
+      NSRect windowGrowBoxRect = [window _growBoxRect];
+      NSRect viewRect = [[view superview] convertRect:frameRect toView:nil];
+      NSRect growBoxRect = NSIntersectionRect(windowGrowBoxRect, viewRect);
+      if (!NSIsEmptyRect(growBoxRect)) {
+        // Before we return a rect, we need to convert it from window
+        // coordinates to content area coordinates and flip the coordinate
+        // system.
+        // Superview is used here because, first, it's a frame rect, so it is
+        // specified in the parent's coordinates and, second, view is not
+        // positioned yet.
+        growBoxRect = [[view superview] convertRect:growBoxRect fromView:nil];
+        growBoxRect.origin.y =
+            NSHeight(frameRect) - NSHeight(growBoxRect);
+        growBoxRect =
+            NSOffsetRect(growBoxRect, -frameRect.origin.x, -frameRect.origin.y);
+
+        reserved_rect =
+            gfx::Rect(growBoxRect.origin.x, growBoxRect.origin.y,
+                      growBoxRect.size.width, growBoxRect.size.height);
+      }
     }
   }