Mac: Fix theme image drawing when building with >=10.9 SDK.

chrome/browser/ui/cocoa/tabs/tab_window_controller.mm

 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_strip_background_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/version_independent_window.h"
 #import "ui/base/cocoa/focus_tracker.h"
 #include "ui/base/theme_provider.h"
 
 @interface TabWindowController(PRIVATE)
 - (void)setUseOverlay:(BOOL)useOverlay;
 @end
 
@@ skipping 24 matching lines @@
 
 @end
 
 @implementation TabWindowController
 
 - (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip {
   NSRect contentRect = NSMakeRect(60, 229, 750, 600);
   base::scoped_nsobject<FramedBrowserWindow> window(
       [[FramedBrowserWindow alloc] initWithContentRect:contentRect
                                            hasTabStrip:hasTabStrip]);
-  [self moveContentViewToBack:[window contentView]];
   [window setReleasedWhenClosed:YES];
   [window setAutorecalculatesKeyViewLoop:YES];
 
   if ((self = [super initWithWindow:window])) {
     [[self window] setDelegate:self];
 
     tabContentArea_.reset([[FastResizeView alloc] initWithFrame:
         NSMakeRect(0, 0, 750, 600)]);
     [tabContentArea_ setAutoresizingMask:NSViewWidthSizable |
                                          NSViewHeightSizable];
     [[[self window] contentView] addSubview:tabContentArea_];
 
+    // tabStripBackgroundView_ draws the theme image behind the tab strip area.
+    // When making a tab dragging window (setUseOverlay:), this view stays in
+    // the parent window so that it can be translucent, while the tab strip view
+    // moves to the child window and stays opaque.
+    NSView* windowView = [window cr_windowView];
+    tabStripBackgroundView_.reset([[TabStripBackgroundView alloc]
+        initWithFrame:NSMakeRect(0,
+                                 NSMaxY([windowView bounds]) -
+                                     kBrowserFrameViewPaintHeight,
+                                 NSWidth([windowView bounds]),
+                                 kBrowserFrameViewPaintHeight)]);
+    [tabStripBackgroundView_
+        setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
+    [windowView addSubview:tabStripBackgroundView_
+                positioned:NSWindowBelow
+                relativeTo:nil];
+
+    [self moveContentViewToBack:[window contentView]];
+
     tabStripView_.reset([[TabStripView alloc]
         initWithFrame:NSMakeRect(0, 0, 750, chrome::kTabStripHeight)]);
     [tabStripView_ setAutoresizingMask:NSViewWidthSizable |
                                        NSViewMinYMargin];
     if (hasTabStrip)
       [self insertTabStripView:tabStripView_ intoWindow:[self window]];
   }
   return self;
 }
 
+- (NSView*)tabStripBackgroundView {
+  return tabStripBackgroundView_;
+}
+
 - (TabStripView*)tabStripView {
   return tabStripView_;
 }
 
 - (FastResizeView*)tabContentArea {
   return tabContentArea_;
 }
 
 - (void)removeOverlay {
   [self setUseOverlay:NO];
@@ skipping 194 matching lines @@
 // drag is complete. This prevents a window (and its overlay) from going away
 // during a drag.
 - (void)deferPerformClose {
   closeDeferred_ = YES;
 }
 
 - (void)moveContentViewToBack:(NSView*)cv {
   base::scoped_nsobject<NSView> contentView([cv retain]);
   NSView* superview = [contentView superview];
   [contentView removeFromSuperview];
-  [superview addSubview:contentView positioned:NSWindowBelow relativeTo:nil];
+  [superview addSubview:contentView
+             positioned:NSWindowAbove
+             relativeTo:tabStripBackgroundView_];

[erikchen, 2014/09/29 23:23:32]

This doesn't look right.
If tabStripBackgroundView_ is nil, then the contentView is brought to the top
instead.

This logic also relies on the assumption that the contentView and
tabStirpBackgroundView_ are in the same window, which doesn't look true in
browser_window_controller_private.mm:378

[Andre, 2014/09/30 03:57:38]

Good call.
Please see latest patch for the fix.

 }
 
 - (void)insertTabStripView:(NSView*)tabStripView intoWindow:(NSWindow*)window {
   NSView* contentParent = [window cr_windowView];
   if (contentParent == [[window contentView] superview]) {
     // Add the tab strip directly above the content view, if they are siblings.
     [contentParent addSubview:tabStripView
                    positioned:NSWindowAbove
                    relativeTo:[window contentView]];
   } else {
     [contentParent addSubview:tabStripView];
   }
 }
 
 // Called when the size of the window content area has changed. Override to
 // position specific views. Base class implementation does nothing.
 - (void)layoutSubviews {
   NOTIMPLEMENTED();
 }
 
 @end