Fixes GetContainerBounds in tab_contents_view_mac.mm

chrome/browser/tab_contents/tab_contents_view_mac.mm

 // Copyright (c) 2011 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 <Carbon/Carbon.h>
 
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 
 #include <string>
 
@@ skipping 131 matching lines @@
   if (!rwhv)
     return NULL;
   return rwhv->GetNativeView();
 }
 
 gfx::NativeWindow TabContentsViewMac::GetTopLevelNativeWindow() const {
   return [cocoa_view_.get() window];
 }
 
 void TabContentsViewMac::GetContainerBounds(gfx::Rect* out) const {
-  *out = [cocoa_view_.get() flipNSRectToRect:[cocoa_view_.get() bounds]];
+  NSRect bounds = [cocoa_view_.get() bounds];
+  NSRect bounds_wrt_window = [cocoa_view_.get() convertRect:bounds toView:nil];

[Avi (use Gerrit), 2011/11/14 19:18:57]

bounds_wrt_window is a horrible name. Just use bounds.

You don't need to annotate variable names with their coordinate systems. Just
don't mix/match.

+
+  NSWindow* window = [cocoa_view_.get() window];
+  NSPoint origin_wrt_screen = [
+      window convertBaseToScreen:bounds_wrt_window.origin];

[Avi (use Gerrit), 2011/11/14 19:18:57]

You can't break there. You break like:

blah blah =
    [xxxx];

+  NSRect bounds_wrt_screen = NSMakeRect(origin_wrt_screen.x,

[Avi (use Gerrit), 2011/11/14 19:18:57]

horrible name; change

+      origin_wrt_screen.y,
+      bounds_wrt_window.size.width,
+      bounds_wrt_window.size.height);
+
+  // Flip y to account for screen flip.
+  NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
+  bounds_wrt_screen.origin.y = [screen frame].size.height
+      - bounds_wrt_screen.origin.y - bounds_wrt_screen.size.height;
+  *out = gfx::Rect(NSRectToCGRect(bounds_wrt_screen));

[Avi (use Gerrit), 2011/11/14 19:18:57]

This is a change of functionality. Before, the bounds returned were in view
coordinates. With your new code, the bounds being returned are in global
coordinates. Which is correct? Where is that documented?

If it's not documented anywhere, please do so.

 }
 
 void TabContentsViewMac::StartDragging(
     const WebDropData& drop_data,
     WebDragOperationsMask allowed_operations,
     const SkBitmap& image,
     const gfx::Point& image_offset) {
   // By allowing nested tasks, the code below also allows Close(),
   // which would deallocate |this|.  The same problem can occur while
   // processing -sendEvent:, so Close() is deferred in that case.
@@ skipping 434 matching lines @@
       [[[notification userInfo] objectForKey:kSelectionDirection]
         unsignedIntegerValue];
   if (direction == NSDirectSelection)
     return;
 
   [self tabContents]->
       FocusThroughTabTraversal(direction == NSSelectingPrevious);
 }
 
 @end