Several background pattern fixes on the Mac....

chrome/browser/cocoa/browser_frame_view.mm

Index: chrome/browser/cocoa/browser_frame_view.mm
===================================================================
--- chrome/browser/cocoa/browser_frame_view.mm	(revision 0)
+++ chrome/browser/cocoa/browser_frame_view.mm	(revision 0)
@@ -0,0 +1,176 @@
+// Copyright (c) 2009 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/cocoa/browser_frame_view.h"
+
+#import <objc/runtime.h>
+#import <Carbon/Carbon.h>
+
+#include "base/logging.h"
+#include "base/scoped_nsobject.h"
+#import "chrome/browser/cocoa/chrome_browser_window.h"
+#import "third_party/GTM/AppKit/GTMTheme.h"
+
+// To line up our background pattern with the patterns in the tabs we need
+// to move our background patterns in the window frame up by two pixels.
+// This will make the themes look slightly different than in Windows/Linux
+// because of the differing heights between window top and tab top, but this
+// has been approved by UI.
+static const NSInteger kBrowserFrameViewPatternPhaseOffset = 2;
+
+@interface NSView (Swizzles)
+- (void)drawRectOriginal:(NSRect)rect;
+- (BOOL)_mouseInGroup:(NSButton*)widget;
+- (void)updateTrackingAreas;
+@end
+
+@implementation BrowserFrameView
+
++ (void)load {
+  // This is where we swizzle drawRect, and add in two methods that we
+  // need. If any of these fail it shouldn't affect the functionality of the
+  // others. If they all fail, we will lose window frame theming and
+  // roll overs for our close widgets, but things should still function
+  // correctly.
+  scoped_nsobject<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
+  Class grayFrameClass = NSClassFromString(@"NSGrayFrame");
+  DCHECK(grayFrameClass);
+  if (!grayFrameClass) return;
+
+  // Exchange draw rect
+  Method m0 = class_getInstanceMethod([self class], @selector(drawRect:));
+  DCHECK(m0);
+  if (m0) {
+    BOOL didAdd = class_addMethod(grayFrameClass,
+                                  @selector(drawRectOriginal:),
+                                  method_getImplementation(m0),
+                                  method_getTypeEncoding(m0));
+    DCHECK(didAdd);
+    if (didAdd) {
+      Method m1 = class_getInstanceMethod(grayFrameClass, @selector(drawRect:));
+      Method m2 = class_getInstanceMethod(grayFrameClass,
+                                          @selector(drawRectOriginal:));
+      DCHECK(m1 && m2);
+      if (m1 && m2) {
+        method_exchangeImplementations(m1, m2);
+      }
+    }
+  }
+
+  // Add _mouseInGroup
+  m0 = class_getInstanceMethod([self class], @selector(_mouseInGroup:));
+  DCHECK(m0);
+  if (m0) {
+    BOOL didAdd = class_addMethod(grayFrameClass,
+                                  @selector(_mouseInGroup:),
+                                  method_getImplementation(m0),
+                                  method_getTypeEncoding(m0));
+    DCHECK(didAdd);
+  }
+  // Add updateTrackingArea
+  m0 = class_getInstanceMethod([self class], @selector(updateTrackingAreas));
+  DCHECK(m0);
+  if (m0) {
+    BOOL didAdd = class_addMethod(grayFrameClass,
+                                  @selector(updateTrackingAreas),
+                                  method_getImplementation(m0),
+                                  method_getTypeEncoding(m0));
+    DCHECK(didAdd);
+  }
+}
+
+- (id)initWithFrame:(NSRect)frame {
+  // This class is not for instantiating.
+  [self doesNotRecognizeSelector:_cmd];
+  return nil;
+}
+
+- (id)initWithCoder:(NSCoder*)coder {
+  // This class is not for instantiating.
+  [self doesNotRecognizeSelector:_cmd];
+  return nil;
+}
+
+// Here is our custom drawing for our frame.
+- (void)drawRect:(NSRect)rect {
+  // If this isn't the window class we expect, then pass it on to the
+  // original implementation.
+  if (![[self window] isKindOfClass:[ChromeBrowserWindow class]]) {
+    [self drawRectOriginal:rect];
+    return;
+  }
+
+  // Clear out everything
+  [[NSColor clearColor] set];
+  NSRectFillUsingOperation(rect, NSCompositeSourceOver);
+
+  // Set up our clip
+  NSWindow* window = [self window];
+  NSRect windowRect = [window frame];
+  windowRect.origin = NSMakePoint(0, 0);
+  [[NSBezierPath bezierPathWithRoundedRect:windowRect
+                                   xRadius:4
+                                   yRadius:4] addClip];
+  [[NSBezierPath bezierPathWithRect:rect] addClip];
+
+  // Draw our background color if we have one, otherwise fall back on
+  // system drawing.
+  GTMTheme* theme = [self gtm_theme];
+  GTMThemeState state = [window isMainWindow] ? GTMThemeStateActiveWindow
+                                              : GTMThemeStateInactiveWindow;
+    NSColor* color = [theme backgroundPatternColorForStyle:GTMThemeStyleWindow
+                                                   state:state];
+  if (color) {
+    // If we have a theme pattern, draw it here.
+    NSPoint phase = NSMakePoint(0, (NSHeight(windowRect) +
+                                    kBrowserFrameViewPatternPhaseOffset));
+    [[NSGraphicsContext currentContext] setPatternPhase:phase];
+    [color set];
+    NSRectFill(rect);
+  } else {
+    [self drawRectOriginal:rect];
+  }
+
+  // Check to see if we have an overlay image.
+  NSImage* overlayImage = [theme valueForAttribute:@"overlay"
+                                             style:GTMThemeStyleWindow
+                                             state:state];
+  if (overlayImage) {
+    NSSize overlaySize = [overlayImage size];
+    NSRect windowFrame = NSMakeRect(0,
+                                    NSHeight(windowRect) - overlaySize.height,
+                                    NSWidth(windowRect),
+                                    overlaySize.height);
+    NSRect imageFrame = NSMakeRect(0, 0, overlaySize.width, overlaySize.height);
+    [overlayImage drawInRect:windowFrame
+                    fromRect:imageFrame
+                   operation:NSCompositeSourceOver
+                    fraction:1.0];
+  }
+}
+
+// Check to see if the mouse is currently in one of our window widgets.
+- (BOOL)_mouseInGroup:(NSButton*)widget {
+  BOOL mouseInGroup = NO;
+  if ([[self window] isKindOfClass:[ChromeBrowserWindow class]]) {
+    ChromeBrowserWindow* window =
+        static_cast<ChromeBrowserWindow*>([self window]);
+    mouseInGroup = [window mouseInGroup:widget];
+  } else {
+    mouseInGroup = [super _mouseInGroup:widget];
+  }
+  return mouseInGroup;
+}
+
+// Let our window handle updating the window widget tracking area.
+- (void)updateTrackingAreas {
+  [super updateTrackingAreas];
+  if ([[self window] isKindOfClass:[ChromeBrowserWindow class]]) {
+    ChromeBrowserWindow* window =
+        static_cast<ChromeBrowserWindow*>([self window]);
+    [window updateTrackingAreas];
+  }
+}
+
+@end
Property changes on: chrome/browser/cocoa/browser_frame_view.mm
___________________________________________________________________
Name: svn:eol-style
   + LF